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

Commit b7dc3a3b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE when removing PIN locked SIM during E911 call"

parents a666dbb6 7130675c

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

+5 −1
Original line number Diff line number Diff line
@@ -64,7 +64,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
@@ -70,7 +70,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: