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

Commit c831c399 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Removing enforcePermissionsAndGetEnforcingAdmin from ... 

Merge "Removing enforcePermissionsAndGetEnforcingAdmin from  cleanCallingIdentity block" into udc-dev
parents dff2d185 9d85929a

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

+25 −21
Original line number Diff line number Diff line
@@ -7840,6 +7840,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                throw new SecurityException("Cannot wipe data. " + restriction

                        + " restriction is set for user " + userId);

            }

        });















        boolean isSystemUser = userId == UserHandle.USER_SYSTEM;















        boolean wipeDevice;









@@ -7861,6 +7862,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                                getAffectedUser(calledOnParentInstance));















                wipeDevice = true;















            } else {













                mInjector.binderWithCleanCallingIdentity(() -> {















                    Preconditions.checkCallAuthorization(!isSystemUser,















                            "User %s is a system user and cannot be removed", userId);















                    boolean isLastNonHeadlessUser = getUserInfo(userId).isFull()









@@ -7871,9 +7873,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                            "Removing user %s would leave the device without any active users. "















                                    + "Consider factory resetting the device instead.",















                            userId);













                });















                wipeDevice = false;















            }















        }













        mInjector.binderWithCleanCallingIdentity(() -> {















            if (wipeDevice) {















                forceWipeDeviceNoLock(















                        (flags & WIPE_EXTERNAL_STORAGE) != 0,