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

Commit 82893ee6 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Fix cannot unlock keyguard when work challege is unified and work mode... 

Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev am: a4c0b1de
am: 29e2e8ca

* commit '29e2e8ca':
  Fix cannot unlock keyguard when work challege is unified and work mode is off

Change-Id: Ie3c29865e8f3fdd5acffec72c3b309ce11f7b767
parents cda498e7 29e2e8ca

services/core/java/com/android/server/am/UserController.java

+4 −1
Original line number Diff line number Diff line
@@ -895,7 +895,10 @@ final class UserController { 
        synchronized (mService) {

            // Bail if already running unlocked, or if not running at all

            final UserState uss = mStartedUsers.get(userId);

            if (uss == null) return false;

            if (uss == null) {

                progress.finish();

                return false;

            }

            switch (uss.state) {

                case STATE_RUNNING_UNLOCKING:

                case STATE_RUNNING_UNLOCKED: