commit 8031c0bbac74d9fcf12391f4b0bb5af7b45878a4
author Felipe Leme <felipeal@google.com> Fri Nov 13 15:13:21 2020 -0800
committer Felipe Leme <felipeal@google.com> Fri Nov 13 15:15:32 2020 -0800
tree e4b010df81d264531e2a1cd01346c271deaf3877
parent 3f74b1f5202132cf7278c5c70a30d28f74512e2a

Use UserManager.removeUserOrSetEphemeral() to remove current user.

Test: manual verification
Bug: 173245580
Bug: 155913815

Change-Id: I74ac8d276f3a78f6c9483a980e4a05486b0c1a8c

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 50cb5de..d92418d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -747,8 +747,9 @@
             return;
         }
         try {
+            getContext().getSystemService(UserManager.class)
+                    .removeUserOrSetEphemeral(UserHandle.myUserId());
             ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM);
-            getContext().getSystemService(UserManager.class).removeUser(UserHandle.myUserId());
         } catch (RemoteException re) {
             Log.e(TAG, "Unable to remove self user");
         }