Merge changes from topic "staged-apex"

* changes:
  Make packagemanager_aidl available to Virt APEX
  getStagedApexInfo() returns @nullable

2 files changed, 9 insertions, 1 deletions

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 89a31c5c2a..bb1b5138e0 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -303,6 +303,14 @@ aidl_interface {
         "aidl/android/content/pm/ApexStagedEvent.aidl",
         "aidl/android/content/pm/StagedApexInfo.aidl",
     ],
+    backend: {
+        rust: {
+            apex_available: [
+                "com.android.virt",
+            ],
+            enabled: true,
+        },
+    },
 }
 
 aidl_interface {
diff --git a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl
index d71f496bf1..7c99f76ec6 100644
--- a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl
+++ b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl
@@ -144,5 +144,5 @@ interface IPackageManagerNative {
      * Get information of APEX which is staged ready for installation.
      * Returns null if no such APEX is found.
      */
-    StagedApexInfo getStagedApexInfo(in @utf8InCpp String moduleName);
+    @nullable StagedApexInfo getStagedApexInfo(in @utf8InCpp String moduleName);
 }