Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0 (1dce37bd) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -625,7 +625,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		return;
		}

		if (mLockPatternUtils.isLockScreenDisabled()) {
		if (mLockPatternUtils.isLockScreenDisabled() && !lockedOrMissing) {
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off");
		return;
		}