OpenXR loader: Refactor content provider access code.

De-duplicate implementations, and be more precise in naming.

Co-authored-by: Rylie Pavlik <[email protected]>

Author: quic-dengkail

src/loader/android_utilities.cpp

@@ -125,7 +125,7 @@ namespace functions {
 static constexpr auto TABLE_PATH = "functions";
 
 /**
- * Create a content URI for querying all rows of the function remapping data for a given
+ * Create a content URI for querying all rows of the runtime function remapping data for a given
  * runtime package and major version of OpenXR.
  *
  * @param systemBroker If the system runtime broker (instead of the installable one) should be queried.
@@ -134,7 +134,7 @@ static constexpr auto TABLE_PATH = "functions";
  * @param abi The Android ABI name in use.
  * @return A content URI for the entire table: the function remapping for that runtime.
  */
-static Uri makeContentUri(bool systemBroker, int majorVersion, std::string const &packageName, const char *abi) {
+static Uri makeRuntimeContentUri(bool systemBroker, int majorVersion, std::string const &packageName, const char *abi) {
     auto builder = Uri_Builder::construct();
     builder.scheme("content")
         .authority(getBrokerAuthority(systemBroker))
@@ -213,34 +213,6 @@ inline JsonManifestBuilder &JsonManifestBuilder::function(const std::string &fun
 
 static constexpr const char *getBrokerTypeName(bool systemBroker) { return systemBroker ? "system" : "installable"; }
 
-static int populateFunctions(wrap::android::content::Context const &context, bool systemBroker, const std::string &packageName,
-                             JsonManifestBuilder &builder) {
-    jni::Array<std::string> projection = makeArray({functions::Columns::FUNCTION_NAME, functions::Columns::SYMBOL_NAME});
-
-    auto uri = functions::makeContentUri(systemBroker, XR_VERSION_MAJOR(XR_CURRENT_API_VERSION), packageName, ABI);
-    ALOGI("populateFunctions: Querying URI: %s", uri.toString().c_str());
-
-    Cursor cursor = context.getContentResolver().query(uri, projection);
-
-    if (cursor.isNull()) {
-        ALOGE("Null cursor when querying content resolver for functions.");
-        return -1;
-    }
-    if (cursor.getCount() < 1) {
-        ALOGE("Non-null but empty cursor when querying content resolver for functions.");
-        cursor.close();
-        return -1;
-    }
-    auto functionIndex = cursor.getColumnIndex(functions::Columns::FUNCTION_NAME);
-    auto symbolIndex = cursor.getColumnIndex(functions::Columns::SYMBOL_NAME);
-    while (cursor.moveToNext()) {
-        builder.function(cursor.getString(functionIndex), cursor.getString(symbolIndex));
-    }
-
-    cursor.close();
-    return 0;
-}
-
 // The current file relies on android-jni-wrappers and jnipp, which may throw on failure.
 // This is problematic when the loader is compiled with exception handling disabled - the consumers can reasonably
 // expect that the compilation with -fno-exceptions will succeed, but the compiler will not accept the code that
@@ -261,33 +233,61 @@ static int populateFunctions(wrap::android::content::Context const &context, boo
 
 #endif  // XRLOADER_DISABLE_EXCEPTION_HANDLING
 
-/// Get cursor for active runtime, parameterized by whether or not we use the system broker
-static bool getActiveRuntimeCursor(wrap::android::content::Context const &context, jni::Array<std::string> const &projection,
-                                   bool systemBroker, Cursor &cursor) {
-    auto uri = active_runtime::makeContentUri(systemBroker, XR_VERSION_MAJOR(XR_CURRENT_API_VERSION), ABI);
-    ALOGI("getActiveRuntimeCursor: Querying URI: %s", uri.toString().c_str());
+/// Generic content resolver query function
+static bool getCursor(wrap::android::content::Context const &context, jni::Array<std::string> const &projection, Uri const &uri,
+                      bool systemBroker, const char *contentDesc, Cursor &out_cursor) {
+    ALOGI("getCursor: Querying URI: %s", uri.toString().c_str());
 
-    ANDROID_UTILITIES_TRY { cursor = context.getContentResolver().query(uri, projection); }
+    ANDROID_UTILITIES_TRY { out_cursor = context.getContentResolver().query(uri, projection); }
     ANDROID_UTILITIES_CATCH_FALLBACK({
-        ALOGW("Exception when querying %s content resolver: %s", getBrokerTypeName(systemBroker), e.what());
-        cursor = {};
+        ALOGI("Exception when querying %s content resolver for %s: %s", getBrokerTypeName(systemBroker), contentDesc, e.what());
+        out_cursor = {};
         return false;
     })
 
-    if (cursor.isNull()) {
-        ALOGW("Null cursor when querying %s content resolver.", getBrokerTypeName(systemBroker));
-        cursor = {};
+    if (out_cursor.isNull()) {
+        ALOGI("Null cursor when querying %s content resolver for %s.", getBrokerTypeName(systemBroker), contentDesc);
+        out_cursor = {};
         return false;
     }
-    if (cursor.getCount() < 1) {
-        ALOGW("Non-null but empty cursor when querying %s content resolver.", getBrokerTypeName(systemBroker));
-        cursor.close();
-        cursor = {};
+    if (out_cursor.getCount() < 1) {
+        ALOGI("Non-null but empty cursor when querying %s content resolver for %s.", getBrokerTypeName(systemBroker), contentDesc);
+        out_cursor.close();
+        out_cursor = {};
         return false;
     }
     return true;
 }
 
+static int populateFunctions(wrap::android::content::Context const &context, bool systemBroker, const std::string &packageName,
+                             JsonManifestBuilder &builder) {
+    jni::Array<std::string> projection = makeArray({functions::Columns::FUNCTION_NAME, functions::Columns::SYMBOL_NAME});
+
+    auto uri = functions::makeRuntimeContentUri(systemBroker, XR_VERSION_MAJOR(XR_CURRENT_API_VERSION), packageName, ABI);
+    ALOGI("populateFunctions: Querying URI: %s", uri.toString().c_str());
+    Cursor cursor;
+    if (!getCursor(context, projection, uri, systemBroker, "functions", cursor)) {
+        return -1;
+    }
+
+    auto functionIndex = cursor.getColumnIndex(functions::Columns::FUNCTION_NAME);
+    auto symbolIndex = cursor.getColumnIndex(functions::Columns::SYMBOL_NAME);
+    while (cursor.moveToNext()) {
+        builder.function(cursor.getString(functionIndex), cursor.getString(symbolIndex));
+    }
+
+    cursor.close();
+    return 0;
+}
+
+/// Get cursor for active runtime, parameterized by whether or not we use the system broker
+static bool getActiveRuntimeCursor(wrap::android::content::Context const &context, jni::Array<std::string> const &projection,
+                                   bool systemBroker, Cursor &cursor) {
+    auto uri = active_runtime::makeContentUri(systemBroker, XR_VERSION_MAJOR(XR_CURRENT_API_VERSION), ABI);
+    ALOGI("getActiveRuntimeCursor: Querying URI: %s", uri.toString().c_str());
+    return getCursor(context, projection, uri, systemBroker, "active runtime", cursor);
+}
+
 int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &context, Json::Value &virtualManifest) {
     jni::Array<std::string> projection = makeArray({active_runtime::Columns::PACKAGE_NAME, active_runtime::Columns::NATIVE_LIB_DIR,
                                                     active_runtime::Columns::SO_FILENAME, active_runtime::Columns::HAS_FUNCTIONS});
@@ -303,7 +303,7 @@ int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &conte
 
     if (cursor.isNull()) {
         // Couldn't find either broker
-        ALOGE("Could access neither the installable nor system runtime broker.");
+        ALOGI("Could access neither the installable nor system runtime broker.");
         return -1;
     }