Merge "Updated: always show the keyguard on device lockdown" into udc-dev (db65e4d5) · 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
		@@ -768,6 +768,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		}
		}
		}

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

		ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
		@@ -1932,6 +1939,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		mExternallyEnabled = enabled;

		if (!enabled && mShowing) {
		if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
		Log.d(TAG, "keyguardEnabled(false) overridden by user lockdown");
		return;
		}
		// hiding keyguard that is showing, remember to reshow later
		if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, "
		+ "disabling status bar expansion");
		@@ -2152,8 +2163,9 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		* Enable the keyguard if the settings are appropriate.
		*/
		private void doKeyguardLocked(Bundle options) {
		// 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;