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

Commit 77582c53 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by android-build-merger
Browse files

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

am: ba053bb5

* commit 'ba053bb5':
  Don't show UNLOCK button when there are no users.
parents 3f81b969 ba053bb5

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;