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

Commit 4ee4e6e0 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't turn off screen after wiping user profiles" into lmp-dev

parents 64fe1584 50c36079

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

                    }