Merge "Remove PIN/PUK keyguard when SIM is removed/ready" (434ccc87) · Commits · e / os / android_frameworks_base

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -61,8 +61,18 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		@Override
		public void onSimStateChanged(int subId, int slotId, State simState) {
		if (DEBUG) Log.v(TAG, "onSimStateChanged(subId=" + subId + ",state=" + simState + ")");
		switch(simState) {
		// If the SIM is removed, then we must remove the keyguard. It will be put up
		// again when the PUK locked SIM is re-entered.
		case ABSENT: {
		KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked(mSubId);
		mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser());
		break;
		}
		default:
		resetState();
		};
		}
		}
		};

		public KeyguardSimPinView(Context context) {

+17 −3

Original line number	Diff line number	Diff line
		@@ -63,8 +63,22 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		@Override
		public void onSimStateChanged(int subId, int slotId, State simState) {
		if (DEBUG) Log.v(TAG, "onSimStateChanged(subId=" + subId + ",state=" + simState + ")");
		switch(simState) {
		// If the SIM is removed, then we must remove the keyguard. It will be put up
		// again when the PUK locked SIM is re-entered.
		case ABSENT:
		// intentional fall-through
		// If the SIM is unlocked via a key sequence through the emergency dialer, it will
		// 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());
		break;
		}
		default:
		resetState();
		};
		}
		}
		};

		public KeyguardSimPukView(Context context) {