commit ae26189aa9a1a2d20ca2006d591d50d7338eb917
author Amith Yamasani <yamasani@google.com> Mon Jun 27 10:40:09 2016 -0700
committer Amith Yamasani <yamasani@google.com> Mon Jun 27 10:58:39 2016 -0700
tree 066640ff367ea185d654c8c36df3ad65462dd987
parent bb1fb395cae4dd92739db4ce6fa48037ba5383f6

Don't reuse userids that are being cleaned up on boot

During the current session, if we're cleaning up some
old users, mark them as being in the remove pile so
that the userIds are not reused right away. Otherwise
there's a potential for confusing the file-based crypto
layer.

Bug: 29635364
Change-Id: I57a868fbe6c58a02ffcea63809d25eba01360e1e

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 627cdd0..d128252 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -471,6 +471,8 @@
                 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;
                 }
             }
         }