Fix cannot unlock keyguard when work challege is unified and work mode is off

Bug: 28138657 Change-Id: I20e2f571d9ac76c0cd92251de7e068f6c7fb3367
2016-04-14 10:00:22 +01:00
parent bb9fb194f8
commit f6ef828a74
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -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: