Merge "Revert "Ensure that resetStateLocked is called"" into main (79bfcba1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -690,19 +690,18 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		} else {
		resetStateLocked();
		}
		} else {
		if (lastSimStateWasLocked && mShowing) {
		if (DEBUG_SIM_STATES) {
		Log.d(TAG, "SIM moved to "
		+ "NOT_READY/ABSENT/UNKNOWN when the previous state "
		+ "was locked. Reset the state.");
		}
		if (simState == TelephonyManager.SIM_STATE_ABSENT) {
		// MVNO SIMs can become transiently NOT_READY when switching networks,
		// so we should only lock when they are ABSENT.
		if (lastSimStateWasLocked) {
		if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the "
		+ "previous state was locked. Reset the state.");
		resetStateLocked();
		}
		}

		mSimWasLocked.append(slotId, false);
		}
		}
		break;
		case TelephonyManager.SIM_STATE_PIN_REQUIRED:
		case TelephonyManager.SIM_STATE_PUK_REQUIRED: