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

Commit a2ced3e8 authored by Kenny Guy's avatar Kenny Guy Committed by android-build-merger
Browse files

am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 

automerge: eeb43fbd

* commit 'eeb43fbd':
  Only switch user if current user is being wiped
parents eeb69d17 eeb43fbd

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

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

                public void run() {

                    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)) {

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

                        }