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

Commit bb87b47d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "After deleting guest user, switch back to previous instead of user0."... 

Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd73

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766



Change-Id: Ic1ec5e652cff3d5a594230038030ad2f32e3bb05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9da3c3e7 e42dcd73

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

+7 −7
Original line number Diff line number Diff line
@@ -977,10 +977,10 @@ public class UserSettings extends SettingsPreferenceFragment 
            return;

        }

        try {

            getContext().getSystemService(UserManager.class)

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

                            /* overrideDevicePolicy= */ false);

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

            mUserManager.removeUserWhenPossible(

                    UserHandle.of(UserHandle.myUserId()), /* overrideDevicePolicy= */ false);

            ActivityManager.getService().switchUser(

                    mUserManager.getPreviousForegroundUser().getIdentifier());

        } catch (RemoteException re) {

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

        }
@@ -1099,7 +1099,7 @@ public class UserSettings extends SettingsPreferenceFragment 
        }

        mMetricsFeatureProvider.action(getActivity(),

                SettingsEnums.ACTION_USER_GUEST_EXIT_CONFIRMED);

        switchToUserId(UserHandle.USER_SYSTEM);

        switchToUserId(mUserManager.getPreviousForegroundUser().getIdentifier());

    }



    private int createGuest() {
@@ -1139,8 +1139,8 @@ public class UserSettings extends SettingsPreferenceFragment 
            // Create a new guest in the foreground, and then immediately switch to it

            int newGuestUserId = createGuest();

            if (newGuestUserId == UserHandle.USER_NULL) {

                Log.e(TAG, "Could not create new guest, switching back to system user");

                switchToUserId(UserHandle.USER_SYSTEM);

                Log.e(TAG, "Could not create new guest, switching back to previous user");

                switchToUserId(mUserManager.getPreviousForegroundUser().getIdentifier());

                mUserManager.removeUser(oldGuestUserId);

                WindowManagerGlobal.getWindowManagerService().lockNow(/* options= */ null);

                return;