commit 564eaec28369bf0217739d7ad1d9b9472c2b4c8b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 16 02:50:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 16 02:50:12 2020 +0000
tree 35d7cd647f5bbb0e5f796ddc832d12380a8d7728
parent baa56fac456ebaee48d9a0e7c8db9fdece7314e0
parent 8031c0bbac74d9fcf12391f4b0bb5af7b45878a4

Merge "Use UserManager.removeUserOrSetEphemeral() to remove current user."

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");
         }