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

Commit 29e2e8ca 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 is off" into nyc-dev 

am: a4c0b1de

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

Change-Id: Ib1f9d7a955168f92b67c55e0d570e7fff00ae279
parents fb83e07a a4c0b1de

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: