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

Merge "Fix NPE when removing PIN locked SIM during E911 call" am: b7dc3a3b21 am: 4910739237

Browse Source 
am: 5b2afc8dab

Change-Id: Id8ca403a839cff994970c370973a91e8e5688722
This commit is contained in:
Brad Ebinger
2017-10-06 04:12:31 +00:00
committed by android-build-merger
parent b3ed63ca23 5b2afc8dab
commit 6a834447ef
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
View File

@@ -66,7 +66,11 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
// again when the PUK locked SIM is re-entered.
case ABSENT: {
KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked(mSubId);
mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
// onSimStateChanged callback can fire when the SIM PIN lock is not currently
// active and mCallback is null.
if (mCallback != null) {
mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
}
break;
}
default:

6
packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
View File

@@ -72,7 +72,11 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
// move into the READY state and the PUK lock keyguard should be removed.
case READY: {
KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked(mSubId);
mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
// mCallback can be null if onSimStateChanged callback is called when keyguard
// isn't active.
if (mCallback != null) {
mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
}
break;
}
default: