Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cb2597f authored by Raj Yengisetty's avatar Raj Yengisetty Committed by Matt Garnes
Browse files

KeyguardViewMediator: remove multi-user checks that are handled in LockPatternUtils 

Change-Id: Ib012c0d5090115e04d01675eafa03117c360bebf
(cherry picked from commit 1dcb9f69)
parent 98fefcdb

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;

        }