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

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

Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev

parents 04e32fa3 73471b76

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

+1 −1
Original line number Diff line number Diff line
@@ -6832,7 +6832,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
    @Override

    public void wipeDataWithReason(int flags, String wipeReasonForUser,

            boolean calledOnParentInstance) {

        if (!mHasFeature) {

        if (!mHasFeature && !hasCallingOrSelfPermission(permission.MASTER_CLEAR)) {

            return;

        }

        final CallerIdentity caller = getCallerIdentity();