commit cc7f845fdd1c402fc297e1c0d8118b6a45bb26ca
author Felipe Leme <felipeal@google.com> Wed Jan 06 23:40:51 2021 -0800
committer Felipe Leme <felipeal@google.com> Wed Jan 06 23:41:37 2021 -0800
tree 73d154f3d780d00c3f71ea04e4d97f57ff0fcc20
parent aaf2ad7738a4288aa5db4a4da4e62af52a1e15ca

Refactored Settings calls to removeUserOrSetEphemeral().

Test: atest com.android.car.user.CarUserServiceTest \
      android.car.apitest.CarDevicePolicyManagerTest#testRemoveUser_whenDisallowed
Bug: 170887769

Change-Id: If797ace64c0fa0262116f649212bbcb1d61e2046

src/com/android/settings/users/UserSettings.java

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 8ba5432..af53a8c 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -751,7 +751,8 @@
         }
         try {
             getContext().getSystemService(UserManager.class)
-                    .removeUserOrSetEphemeral(UserHandle.myUserId());
+                    .removeUserOrSetEphemeral(UserHandle.myUserId(),
+                            /* evenWhenDisallowed= */ false);
             ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM);
         } catch (RemoteException re) {
             Log.e(TAG, "Unable to remove self user");