From f6ef828a7495be3bfe767ad0bb67ad155c6101de Mon Sep 17 00:00:00 2001
From: Ricky Wai <rickywai@google.com>
Date: Thu, 14 Apr 2016 10:00:22 +0100
Subject: [PATCH] Fix cannot unlock keyguard when work challege is unified and
 work mode is off

Bug: 28138657
Change-Id: I20e2f571d9ac76c0cd92251de7e068f6c7fb3367
---
 services/core/java/com/android/server/am/UserController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 5ebb9a7553ad6..4292fcf406b0a 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 @@ 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: