Merge "Add stagedApexInfos to ApexStagedEvent" into main

Author: Jooyung Han

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

@@ -16,12 +16,14 @@
 
 package android.content.pm;
 
+import android.content.pm.StagedApexInfo;
+
 /**
  * This event is designed for notification to native code listener about
  * any changes to set of apex packages staged for installation on next boot.
  *
  * @hide
  */
 parcelable ApexStagedEvent {
-  @utf8InCpp String[] stagedApexModuleNames;
+  StagedApexInfo[] stagedApexInfos;
 }

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

@@ -135,13 +135,7 @@ interface IPackageManagerNative {
     void unregisterStagedApexObserver(in IStagedApexObserver observer);
 
     /**
-     * Get APEX module names of all APEX that are staged ready for installation
+     * Get information of staged APEXes.
      */
-    @utf8InCpp String[] getStagedApexModuleNames();
-
-    /**
-     * Get information of APEX which is staged ready for installation.
-     * Returns null if no such APEX is found.
-     */
-    @nullable StagedApexInfo getStagedApexInfo(in @utf8InCpp String moduleName);
+    StagedApexInfo[] getStagedApexInfos();
 }

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

@@ -22,6 +22,7 @@ package android.content.pm;
  *
  * @hide
  */
+@JavaDerive(equals=true)
 parcelable StagedApexInfo {
   @utf8InCpp String moduleName;
   @utf8InCpp String diskImagePath;