commit 383d2d008fc414852a71217772a739a21c28b63c
author Alex Chau <alexchau@google.com> Thu Jan 18 16:07:36 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jan 19 03:16:27 2018 +0000
tree 064bd6521342983a61e417a6ee763cb39ad58cfe
parent 4d298d82aeaac169a08fa532b59ae531c304fb59

Check if UserState is null in stopGuestOrEphemeralUserIfBackground

- UserState may be removed from mStartedUsers if it has already been stopped

Bug: 72133858
Test: Manually create secondary user, and exit the user in SetupWizard
Change-Id: I92783f89a9d4de9a7eca81e688b4e115c2f5535a
(cherry picked from commit 62995efee31a264e115719bae6827ebb48a3828c)

services/core/java/com/android/server/am/UserController.java

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index c7210a8..65bebc6 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -796,7 +796,7 @@
     private void stopGuestOrEphemeralUserIfBackground(int oldUserId) {
         if (DEBUG_MU) Slog.i(TAG, "Stop guest or ephemeral user if background: " + oldUserId);
         UserState oldUss = mStartedUsers.get(oldUserId);
-        if (oldUserId == UserHandle.USER_SYSTEM || oldUserId == mCurrentUserId
+        if (oldUserId == UserHandle.USER_SYSTEM || oldUserId == mCurrentUserId || oldUss == null
                 || oldUss.state == UserState.STATE_STOPPING
                 || oldUss.state == UserState.STATE_SHUTDOWN) {
             return;