From 1df89814fb22caada2b617bcb860d1482e35919c Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 6 Feb 2018 14:41:47 +0000
Subject: [PATCH] Use removeUserEvenWhenDisallowed for removing ephemeral user

- To bypass DISALLOW_REMOVE_USER check

Bug: 72437780
Test: cts-tradefed run singleCommand cts -m DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testCreateAndManageUser_StopEphemeralUser_DisallowRemoveUser
Change-Id: Ib07ccc4cdbd8da2c2b314da30479e10b9085b697
---
 services/core/java/com/android/server/am/UserController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index 7b0c714b0b4e3..d54e2640ceed6 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 @@ 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 {