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

Commit 61487dfa 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:... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia24b0b2e7a1155670aa7b0e0fbe4c805f2f77eae
parents a32301cf 24162e16

core/java/android/os/RecoverySystem.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -958,7 +958,11 @@ public class RecoverySystem { 
            Intent intent = new Intent(ACTION_EUICC_FACTORY_RESET);

            Intent intent = new Intent(ACTION_EUICC_FACTORY_RESET);

            intent.setPackage(packageName);

            intent.setPackage(packageName);

            PendingIntent callbackIntent = PendingIntent.getBroadcastAsUser(

            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();

            IntentFilter filterConsent = new IntentFilter();

            filterConsent.addAction(ACTION_EUICC_FACTORY_RESET);

            filterConsent.addAction(ACTION_EUICC_FACTORY_RESET);

            HandlerThread euiccHandlerThread = new HandlerThread("euiccWipeFinishReceiverThread");

            HandlerThread euiccHandlerThread = new HandlerThread("euiccWipeFinishReceiverThread");
@@ -1052,7 +1056,11 @@ public class RecoverySystem { 
        Intent intent = new Intent(ACTION_EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS);

        Intent intent = new Intent(ACTION_EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS);

        intent.setPackage(PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK);

        intent.setPackage(PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK);

        PendingIntent callbackIntent = PendingIntent.getBroadcastAsUser(

        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 intentFilter = new IntentFilter();

        intentFilter.addAction(ACTION_EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS);

        intentFilter.addAction(ACTION_EUICC_REMOVE_INVISIBLE_SUBSCRIPTIONS);

        HandlerThread euiccHandlerThread =

        HandlerThread euiccHandlerThread =