From 27b5d2e2f992d4f3c3984fa73f1fb861b4c456c5 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 11 Apr 2016 11:14:00 -0600
Subject: [PATCH] Skip unlock requests for users who aren't running.

Bug: 28111989
Change-Id: I80b6dd1e5a2d919b0a198667e18b7979effe6999
---
 services/core/java/com/android/server/am/UserController.java | 3 ++-
 1 file changed, 2 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 bea26c75dcebb..514c6c54bdcc5 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -893,8 +893,9 @@ final class UserController {
     boolean unlockUserCleared(final int userId, byte[] token, byte[] secret,
             ProgressReporter progress) {
         synchronized (mService) {
-            // Bail if already running unlocked
+            // Bail if already running unlocked, or if not running at all
             final UserState uss = mStartedUsers.get(userId);
+            if (uss == null) return false;
             switch (uss.state) {
                 case STATE_RUNNING_UNLOCKING:
                 case STATE_RUNNING_UNLOCKED: