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

Commit e9acb59a authored by Kenny Guy's avatar Kenny Guy
Browse files

Only switch user if current user is being wiped 

Only try and switch to owner if the current user
is being removed.

Bug: 19252449
Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35
parent d7310bd1

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -3049,7 +3049,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            mHandler.post(new Runnable() {

            mHandler.post(new Runnable() {

                public void run() {

                public void run() {

                    try {

                    try {

                        ActivityManagerNative.getDefault().switchUser(UserHandle.USER_OWNER);

                        IActivityManager am = ActivityManagerNative.getDefault();

                        if (am.getCurrentUser().id == userHandle) {

                            am.switchUser(UserHandle.USER_OWNER);

                        }

                        if (!mUserManager.removeUser(userHandle)) {

                        if (!mUserManager.removeUser(userHandle)) {

                            Slog.w(LOG_TAG, "Couldn't remove user " + userHandle);

                            Slog.w(LOG_TAG, "Couldn't remove user " + userHandle);

                        }

                        }