Merge "KeyguardViewMediator: remove multi-user checks that are handled in LockPatternUtils" (2d27f485) · Commits · e / os / android_frameworks_base

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -687,8 +687,7 @@ public class KeyguardViewMediator extends SystemUI {
		}

		private void maybeSendUserPresentBroadcast() {
		if (mSystemReady && isKeyguardDisabled()
		&& !mUserManager.isUserSwitcherEnabled()) {
		if (mSystemReady && isKeyguardDisabled()) {
		// Lock screen is disabled because the user has set the preference to "None".
		// In this case, send out ACTION_USER_PRESENT here instead of in
		// handleKeyguardDone()
		@@ -701,7 +700,7 @@ public class KeyguardViewMediator extends SystemUI {
		if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled externally");
		return true;
		}
		if (mLockPatternUtils.isLockScreenDisabled() && mUserManager.getUsers(true).size() == 1) {
		if (mLockPatternUtils.isLockScreenDisabled()) {
		if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled by setting");
		return true;
		}