From 8031c0bbac74d9fcf12391f4b0bb5af7b45878a4 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Fri, 13 Nov 2020 15:13:21 -0800
Subject: [PATCH] Use UserManager.removeUserOrSetEphemeral() to remove current
 user.

Test: manual verification
Bug: 173245580
Bug: 155913815

Change-Id: I74ac8d276f3a78f6c9483a980e4a05486b0c1a8c
---
 src/com/android/settings/users/UserSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 50cb5de508b..d92418ddc3e 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -747,8 +747,9 @@ public class UserSettings extends SettingsPreferenceFragment
             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");
         }