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

Commit 3158f451 authored by Felipe Leme's avatar Felipe Leme Committed by Android (Google) Code Review
Browse files

Merge "Refactored Settings calls to removeUserOrSetEphemeral()."

parents 8e2ecd59 cc7f845f

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

+2 −1
Original line number Diff line number Diff line
@@ -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");