commit cfd046033588758691c01aa652a82db24c967845
author Jooyung Han <jooyung@google.com> Fri Oct 08 00:26:40 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 08 00:26:40 2021 +0000
tree 02c4d41046d5f0184b0e6bab53bc57b8b19eee26
parent 9243f909f67b7c46c23b94f2b05ce4476ba295d5
parent fc62269a3f0c605e7b7450d277e54f7c3ea873ff

Merge changes from topic "staged-apex"

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

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 89a31c5..bb1b513 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -303,6 +303,14 @@
         "aidl/android/content/pm/ApexStagedEvent.aidl",
         "aidl/android/content/pm/StagedApexInfo.aidl",
     ],
+    backend: {
+        rust: {
+            apex_available: [
+                "com.android.virt",
+            ],
+            enabled: true,
+        },
+    },
 }
 
 aidl_interface {

libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl

diff --git a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl
index d71f496..7c99f76 100644
--- a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl
+++ b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl
@@ -144,5 +144,5 @@
      * 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);
 }