OpenXR loader: Retrieve runtime info source

Author: quic-dengkail

src/loader/android_utilities.cpp

@@ -273,12 +273,14 @@ static bool getActiveRuntimeCursor(wrap::android::content::Context const &contex
     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});
+int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &context, Json::Value &virtualManifest,
+                                    bool &systemBroker) {
+    const 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});
 
     // First, try getting the installable broker's provider
-    bool systemBroker = false;
+    systemBroker = false;
     Cursor cursor;
     if (!getActiveRuntimeCursor(context, projection, systemBroker, cursor)) {
         // OK, try the system broker as a fallback.

src/loader/android_utilities.h

@@ -26,7 +26,8 @@ using wrap::android::content::Context;
  *
  * @return 0 on success, something else on failure.
  */
-int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &context, Json::Value &virtualManifest);
+int getActiveRuntimeVirtualManifest(wrap::android::content::Context const &context, Json::Value &virtualManifest,
+                                    bool &systemBroker);
 }  // namespace openxr_android
 
 #endif  // __ANDROID__

src/loader/runtime_interface.cpp

@@ -45,8 +45,9 @@ XrResult GetPlatformRuntimeVirtualManifest(Json::Value& out_manifest) {
     if (context.isNull()) {
         return XR_ERROR_INITIALIZATION_FAILED;
     }
+    bool systemBroker = false;
     Json::Value virtualManifest;
-    if (0 != openxr_android::getActiveRuntimeVirtualManifest(context, virtualManifest)) {
+    if (0 != openxr_android::getActiveRuntimeVirtualManifest(context, virtualManifest, systemBroker)) {
         return XR_ERROR_INITIALIZATION_FAILED;
     }
     out_manifest = virtualManifest;