Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev (b78c51ea) · Commits · e / os / android_frameworks_base

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

+14 −2

Original line number	Diff line number	Diff line
		@@ -677,6 +677,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		}
		}
		}

		@Override
		public void onStrongAuthStateChanged(int userId) {
		if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
		doKeyguardLocked(null);
		}
		}
		};

		ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
		@@ -1318,6 +1325,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		mExternallyEnabled = enabled;

		if (!enabled && mShowing) {
		if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
		Log.d(TAG, "keyguardEnabled(false) overridden by user lockdown");
		return;
		}
		if (mExitSecureCallback != null) {
		if (DEBUG) Log.d(TAG, "in process of verifyUnlock request, ignoring");
		// we're in the process of handling a request to verify the user
		@@ -1534,8 +1545,9 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		return;
		}

		// if another app is disabling us, don't show
		if (!mExternallyEnabled) {
		// if another app is disabling us, don't show unless we're in lockdown mode
		if (!mExternallyEnabled
		&& !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
		if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");

		mNeedToReshowWhenReenabled = true;