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

Commit 33f6104d authored by Xiaohui Chen's avatar Xiaohui Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix unlock problem in split system user mode"

parents 5608a200 d743ceff

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

+4 −3
Original line number Diff line number Diff line
@@ -96,9 +96,10 @@ public class KeyguardBouncer { 
        }



        final int activeUserId = ActivityManager.getCurrentUser();

        final boolean allowDismissKeyguard =

                !UserManager.isSplitSystemUser()

                && activeUserId == keyguardUserId;

        final boolean isSystemUser =

                UserManager.isSplitSystemUser() && activeUserId == UserHandle.USER_SYSTEM;

        final boolean allowDismissKeyguard = !isSystemUser && activeUserId == keyguardUserId;



        // If allowed, try to dismiss the Keyguard. If no security auth (password/pin/pattern) is

        // set, this will dismiss the whole Keyguard. Otherwise, show the bouncer.

        if (allowDismissKeyguard && mKeyguardView.dismiss(activeUserId)) {