Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a7d5962 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replaced removeUserOrSetEphemeral by removeUserWhenPossible"

parents 57c8c2e3 d2282487

src/com/android/settings/users/UserSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -814,8 +814,8 @@ public class UserSettings extends SettingsPreferenceFragment 
        }

        try {

            getContext().getSystemService(UserManager.class)

                    .removeUserOrSetEphemeral(UserHandle.myUserId(),

                            /* evenWhenDisallowed= */ false);

                    .removeUserWhenPossible(UserHandle.of(UserHandle.myUserId()),

                            /* overrideDevicePolicy= */ false);

            ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM);

        } catch (RemoteException re) {

            Log.e(TAG, "Unable to remove self user");