Skip unlock requests for users who aren't running.

Bug: 28111989 Change-Id: I80b6dd1e5a2d919b0a198667e18b7979effe6999
2016-04-11 11:14:00 -06:00
parent 4288419787
commit 27b5d2e2f9
1 changed files with 2 additions and 1 deletions
--- 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: