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
This commit is contained in:
Alex Chau
2018-02-06 14:41:47 +00:00
parent e31bb77f3d
commit 1df89814fb

View File

@@ -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 {