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

Commit 20d93ec7 authored by Jiashen Wang's avatar Jiashen Wang Committed by Android (Google) Code Review
Browse files

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

parents 9cc9b73c a24192a7

core/java/android/os/RecoverySystem.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -908,7 +908,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");
@@ -1002,7 +1006,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 =