Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9f3cebd authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Add stagedApexInfos to ApexStagedEvent" into main am: 9a01911a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3304172



Change-Id: Ic4092ea141bc16448e872bceb2ee841e08a2e4e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6acfa696 9a01911a

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

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


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.
@@ -23,5 +25,5 @@ package android.content.pm; 
 * @hide

 */

parcelable ApexStagedEvent {

  @utf8InCpp String[] stagedApexModuleNames;

  StagedApexInfo[] stagedApexInfos;

}

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

+2 −8
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ package android.content.pm; 
 *

 * @hide

 */

@JavaDerive(equals=true)

parcelable StagedApexInfo {

  @utf8InCpp String moduleName;

  @utf8InCpp String diskImagePath;