Merge "Skip dead users when getting primary."

2015-11-18 21:53:15 +00:00
parent 4550388a3f d3e9e1835b
commit 228c322c94
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -322,7 +322,7 @@ public class UserManagerService extends IUserManager.Stub {
            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;
                }
            }