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

Commit 822856bc authored by Jiashen Wang's avatar Jiashen Wang Committed by Gerrit Code Review
Browse files

Merge "Add the immutable flag to EuiccManager calls in RecoverySystem"

parents 5eeae4c7 6851cf0c

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 =