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

Commit bc781ead authored by Robin Lee's avatar Robin Lee Committed by Android Git Automerger
Browse files

am 9011c4e7: am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev 

* commit '9011c4e7d105f15660fecc5ebabdf80037752bb8':
  Don't turn off screen after wiping user profiles
parents b4a976dc 6a41c8c4

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

+1 −3
Original line number Diff line number Diff line
@@ -2612,13 +2612,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        if (userHandle == UserHandle.USER_OWNER) {

            wipeDataLocked(flags);

        } else {

            lockNowUnchecked();

            mHandler.post(new Runnable() {

                public void run() {

                    try {

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

                        (mUserManager)

                                .removeUser(userHandle);

                        mUserManager.removeUser(userHandle);

                    } catch (RemoteException re) {

                        // Shouldn't happen

                    }