Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev (584df59a) · Commits · e / os / android_frameworks_base

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

+1 −9

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

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

		ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
		@@ -1542,8 +1535,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		}

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

		mNeedToReshowWhenReenabled = true;