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

Commit 24162e16 authored by Jiashen Wang's avatar Jiashen Wang Committed by Automerger Merge Worker
Browse files

Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec7ac9ff98c8ad75998bfa079da3f2b2ecd47fa5
parents 5bddee5d 822856bc

core/java/android/os/RecoverySystem.java

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