Merge "Use removeUserEvenWhenDisallowed for removing ephemeral user"

2018-02-07 16:02:52 +00:00
parent 940acac974 1df89814fb
commit db4c5bc8a1
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -743,7 +743,7 @@ class UserController implements Handler.Callback {
            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 {