Merge "Refactored Settings calls to removeUserOrSetEphemeral()."

2021-01-22 16:31:09 +00:00
parent 8e2ecd5918 cc7f845fdd
commit 3158f45161
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -752,7 +752,8 @@ public class UserSettings extends SettingsPreferenceFragment
        }
        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");