diff options
| author | Jiashen Wang <jiashenwang@google.com> | 2021-02-18 01:36:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-18 01:36:22 +0000 |
| commit | 24162e16799a0eb366be2a0fcf219a273d12eca5 (patch) | |
| tree | 9e7c954063d61d023800bb2328f10857db3f7374 /core/java/android | |
| parent | 5bddee5dda26bcf6b9cb1a71c3d23627800ad19b (diff) | |
| parent | 822856bcafbedba0cae0ca203a420debbd5dea89 (diff) | |
Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bcaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec7ac9ff98c8ad75998bfa079da3f2b2ecd47fa5
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/RecoverySystem.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 6713de83d394..93c1690e3813 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -958,7 +958,11 @@ public class RecoverySystem { Intent intent = new Intent(ACTION_EUICC_FACTORY_RESET); intent.setPackage(packageName); PendingIntent callbackIntent = PendingIntent.getBroadcastAsUser( - context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, UserHandle.SYSTEM); + context, + 0, + intent, + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT, + UserHandle.SYSTEM); IntentFilter filterConsent = new IntentFilter(); filterConsent.addAction(ACTION_EUICC_FACTORY_RESET); HandlerThread euiccHandlerThread = new HandlerThread("euiccWipeFinishReceiverThread"); @@ -1052,7 +1056,11 @@ public class RecoverySystem { Intent intent = new Intent(ACTION_EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS); intent.setPackage(PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK); PendingIntent callbackIntent = PendingIntent.getBroadcastAsUser( - context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, UserHandle.SYSTEM); + context, + 0, + intent, + PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT, + UserHandle.SYSTEM); IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(ACTION_EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS); HandlerThread euiccHandlerThread = |