Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie8796953e95a67942b8ce8c304f3e250aaf771f9
This commit is contained in:
TreeHugger Robot
2021-06-16 06:49:56 +00:00
committed by Automerger Merge Worker
parent c559206bd8 72ca552528
commit 9a6dafd359
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -6832,7 +6832,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@Override @Override
public void wipeDataWithReason(int flags, String wipeReasonForUser, public void wipeDataWithReason(int flags, String wipeReasonForUser,
boolean calledOnParentInstance) { boolean calledOnParentInstance) {
if (!mHasFeature) { if (!mHasFeature && !hasCallingOrSelfPermission(permission.MASTER_CLEAR)) {
return; return;
} }
final CallerIdentity caller = getCallerIdentity(); final CallerIdentity caller = getCallerIdentity();