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

Commit 11ba1cb6 authored by Qingxi Li's avatar Qingxi Li Committed by android-build-merger
Browse files

Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev 

am: b7febbb7

Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
parents e47cc86d b7febbb7

core/java/android/os/RecoverySystem.java

+3 −2
Original line number Diff line number Diff line
@@ -808,7 +808,8 @@ public class RecoverySystem { 
            HandlerThread euiccHandlerThread = new HandlerThread("euiccWipeFinishReceiverThread");

            euiccHandlerThread.start();

            Handler euiccHandler = new Handler(euiccHandlerThread.getLooper());

            context.registerReceiver(euiccWipeFinishReceiver, filterConsent, null, euiccHandler);

            context.getApplicationContext()

                    .registerReceiver(euiccWipeFinishReceiver, filterConsent, null, euiccHandler);

            if (isWipeEuicc) {

                euiccManager.eraseSubscriptions(callbackIntent);

            } else {
@@ -831,7 +832,7 @@ public class RecoverySystem { 
                        Log.e(TAG, "Timeout retaining eUICC data.");

                    }

                }

                context.unregisterReceiver(euiccWipeFinishReceiver);

                context.getApplicationContext().unregisterReceiver(euiccWipeFinishReceiver);

            } catch (InterruptedException e) {

                Thread.currentThread().interrupt();

                if (isWipeEuicc) {