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

Commit e2f0f735 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Don't show UNLOCK button when there are no users." into nyc-dev

parents 791a7df8 ec018434

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

+5 −1
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ public class KeyguardBouncer { 
    }



    public void show(boolean resetSecuritySelection) {

        final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser();

        if (keyguardUserId == UserHandle.USER_SYSTEM && UserManager.isSplitSystemUser()) {

            // In split system user mode, we never unlock system user.

            return;

        }

        mFalsingManager.onBouncerShown();

        ensureView();

        if (resetSecuritySelection) {
@@ -91,7 +96,6 @@ public class KeyguardBouncer { 
        }



        final int activeUserId = ActivityManager.getCurrentUser();

        final int keyguardUserId = KeyguardUpdateMonitor.getCurrentUser();

        final boolean allowDismissKeyguard =

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

                && activeUserId == keyguardUserId;