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

Commit a4c0b1de authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Fix cannot unlock keyguard when work challege is unified and work mode is off" into nyc-dev

parents 46dc79ce f6ef828a

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: