diff options
| author | 2024-10-15 00:35:35 +0000 | |
|---|---|---|
| committer | 2024-10-15 00:35:35 +0000 | |
| commit | bce23a6ec3f14ff77eb40f0f88195a1bf841533d (patch) | |
| tree | 15146e96a8b72fb7b5afea96d96d00e5b43e6e52 /libs | |
| parent | 2648285f56f0410d82518d0592c4c9c2f48ea289 (diff) | |
| parent | b9f3cebd7dce0a5fa6211d679a6549f74ce2f599 (diff) | |
Merge "Add stagedApexInfos to ApexStagedEvent" into main am: 9a01911add am: b9f3cebd7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3304172
Change-Id: Iee4e5ec1e534131b08024708024f0cfb44648e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
3 files changed, 6 insertions, 9 deletions
diff --git a/libs/binder/aidl/android/content/pm/ApexStagedEvent.aidl b/libs/binder/aidl/android/content/pm/ApexStagedEvent.aidl index 75f87530f9..9bac38641e 100644 --- a/libs/binder/aidl/android/content/pm/ApexStagedEvent.aidl +++ b/libs/binder/aidl/android/content/pm/ApexStagedEvent.aidl @@ -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; } diff --git a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl index 3ddfefa311..0f0be2f22b 100644 --- a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl +++ b/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(); } diff --git a/libs/binder/aidl/android/content/pm/StagedApexInfo.aidl b/libs/binder/aidl/android/content/pm/StagedApexInfo.aidl index 949835b452..8f7ad30779 100644 --- a/libs/binder/aidl/android/content/pm/StagedApexInfo.aidl +++ b/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; |