From d3e9e1835b599a6d1dbe50ca1175b80023c6b5f0 Mon Sep 17 00:00:00 2001
From: Xiaohui Chen <xiaohuic@google.com>
Date: Wed, 18 Nov 2015 13:37:32 -0800
Subject: [PATCH] Skip dead users when getting primary.

Bug: 25769085
Change-Id: I220d175839509e4dbf3f2992a90e9625d0caf825
---
 .../core/java/com/android/server/pm/UserManagerService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index ab0b182762e1e..53ce9e269d4a4 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 @@ 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;
                 }
             }