commit d3e9e1835b599a6d1dbe50ca1175b80023c6b5f0
author Xiaohui Chen <xiaohuic@google.com> Wed Nov 18 13:37:32 2015 -0800
committer Xiaohui Chen <xiaohuic@google.com> Wed Nov 18 13:37:32 2015 -0800
tree 8e6ac041f71d15596e41e9db56968c367aee4fde
parent 0283d44c0856499b5aabc3212487a44d6f4b2f63

Skip dead users when getting primary.

Bug: 25769085
Change-Id: I220d175839509e4dbf3f2992a90e9625d0caf825

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index ab0b182..53ce9e2 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -322,7 +322,7 @@
             final int userSize = mUsers.size();
             for (int i = 0; i < userSize; i++) {
                 UserInfo ui = mUsers.valueAt(i);
-                if (ui.isPrimary()) {
+                if (ui.isPrimary() && !mRemovingUserIds.get(ui.id)) {
                     return ui;
                 }
             }