Merge \"Don\'t reuse userids that are being cleaned up on boot\" into nyc-mr1-dev

am: 88a4c5ba4e Change-Id: Ifb86a71c449d02ae4732bd214e9651c86eef8b6a
2016-06-27 20:22:43 +00:00
parent ad459ec118 88a4c5ba4e
commit 33ffd531bd
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -471,6 +471,8 @@ public class UserManagerService extends IUserManager.Stub {
                UserInfo ui = mUsers.valueAt(i).info;
                if ((ui.partial || ui.guestToRemove || ui.isEphemeral()) && i != 0) {
                    partials.add(ui);
+                    mRemovingUserIds.append(ui.id, true);
+                    ui.partial = true;
                }
            }
        }