Merge "On device lockdown, always show the keyguard" into rvc-dev (cc94a537) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -575,6 +575,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
	notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper);		notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper);
	}		}
	}		}

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

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

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

	mNeedToReshowWhenReenabled = true;		mNeedToReshowWhenReenabled = true;