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

Commit 28b109df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca5525 am: 01334221

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949624

Change-Id: I024c80fd4af40824e01f1912463c03eb8a1e8e7b
parents 0f49861d 01334221

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();