Merge "Don't let apps disable the SIM PIN entry screen." into ics (ca0d4b92) · Commits · e / os / android_frameworks_base

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

+16 −16

Original line number	Diff line number	Diff line
		@@ -623,22 +623,6 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		* the keyguard to be shown.
		*/
		private void doKeyguardLocked() {
		// if another app is disabling us, don't show
		if (!mExternallyEnabled) {
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");

		// note: we should set mNeedToReshowWhenReenabled=true here, but that makes
		// for an occasional ugly flicker in this situation:
		// 1) receive a call with the screen on (no keyguard) or make a call
		// 2) screen times out
		// 3) user hits key to turn screen back on
		// instead, we reenable the keyguard when we know the screen is off and the call
		// ends (see the broadcast receiver below)
		// TODO: clean this up when we have better support at the window manager level
		// for apps that wish to be on top of the keyguard
		return;
		}

		// if the keyguard is already showing, don't bother
		if (mKeyguardViewManager.isShowing()) {
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");
		@@ -661,6 +645,22 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
		return;
		}

		// if another app is disabling us, don't show
		if (!mExternallyEnabled && !lockedOrMissing) {
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");

		// note: we should set mNeedToReshowWhenReenabled=true here, but that makes
		// for an occasional ugly flicker in this situation:
		// 1) receive a call with the screen on (no keyguard) or make a call
		// 2) screen times out
		// 3) user hits key to turn screen back on
		// instead, we reenable the keyguard when we know the screen is off and the call
		// ends (see the broadcast receiver below)
		// TODO: clean this up when we have better support at the window manager level
		// for apps that wish to be on top of the keyguard
		return;
		}

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