commit | f6ef828a7495be3bfe767ad0bb67ad155c6101de | [log] [tgz] |
---|---|---|
author | Ricky Wai <rickywai@google.com> | Thu Apr 14 10:00:22 2016 +0100 |
committer | Ricky Wai <rickywai@google.com> | Fri Apr 15 09:21:17 2016 +0000 |
tree | ff4bfd6754b2b1d423df1367c402755f917d87cb | |
parent | bb9fb194f85225fcf0360fc53da51f12a649bd1b [diff] |
Fix cannot unlock keyguard when work challege is unified and work mode is off Bug: 28138657 Change-Id: I20e2f571d9ac76c0cd92251de7e068f6c7fb3367
diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 5ebb9a7..4292fcf 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java
@@ -895,7 +895,10 @@ 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: