Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b7febbb727

Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
This commit is contained in:
Qingxi Li
2017-07-13 19:08:27 +00:00
committed by android-build-merger
parent e47cc86d69 b7febbb727
commit 11ba1cb60a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/os/RecoverySystem.java
View File

@@ -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) {