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

Commit 24e358d1 authored by Alex Chau's avatar Alex Chau Committed by android-build-merger
Browse files

Merge "Dismiss keyguard when switching user if lockscreen is disabled on new... 

Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev am: 87646514
am: de458dba

Change-Id: I4c19926341e379bf98e971a991bca3f788a6fa6a
parents f9b895b5 de458dba

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

+6 −1
Original line number Diff line number Diff line
@@ -357,7 +357,12 @@ public class KeyguardViewMediator extends SystemUI { 
            // ActivityManagerService) will not reconstruct the keyguard if it is already showing.

            synchronized (KeyguardViewMediator.this) {

                resetKeyguardDonePendingLocked();

                if (mLockPatternUtils.isLockScreenDisabled(userId)) {

                    // If we switching to a user that has keyguard disabled, dismiss keyguard.

                    dismiss(null /* callback */, null /* message */);

                } else {

                    resetStateLocked();

                }

                adjustStatusBarLocked();

            }

        }