commit db4c5bc8a1875aeecc644e30ae851f44b15b6653
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 07 16:02:52 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 07 16:02:52 2018 +0000
tree 9a433e752c7f47fa0703e868e289c9f48e193f74
parent 940acac9749f2061823bfa3fcfa2beecdaaef7e7
parent 1df89814fb22caada2b617bcb860d1482e35919c

Merge "Use removeUserEvenWhenDisallowed for removing ephemeral user"

services/core/java/com/android/server/am/UserController.java

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 7b0c714..d54e264 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -743,7 +743,7 @@
             mInjector.stackSupervisorRemoveUser(userId);
             // Remove the user if it is ephemeral.
             if (getUserInfo(userId).isEphemeral()) {
-                mInjector.getUserManager().removeUser(userId);
+                mInjector.getUserManager().removeUserEvenWhenDisallowed(userId);
             }
             // Evict the user's credential encryption key.
             try {