commit 3158f45161d79fbde69855ebb20ed700d6f61ec8
author Felipe Leme <felipeal@google.com> Fri Jan 22 16:31:09 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 22 16:31:09 2021 +0000
tree c871ef56ba8af188e1eab4cfeaa27a75be189987
parent 8e2ecd5918abda3f3399341e1f8500d090b901b2
parent cc7f845fdd1c402fc297e1c0d8118b6a45bb26ca

Merge "Refactored Settings calls to removeUserOrSetEphemeral()."

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 461fd87..fa215e7 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -752,7 +752,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");