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

Commit ad545464 authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev

parents c4a0b342 3311859a

packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java

+5 −1
Original line number Diff line number Diff line
@@ -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);

                    // 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:

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java

+5 −1
Original line number Diff line number Diff line
@@ -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 can be null if onSimStateChanged callback is called when keyguard

                    // isn't active.

                    if (mCallback != null) {

                        mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());

                    }

                    break;

                }

                default: