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

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev

Browse Source
This commit is contained in:
Suprabh Shukla
2017-02-02 22:58:45 +00:00
committed by Android (Google) Code Review
parent ec3e2b9dcb 14ed611912
commit af85feef36
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2894,7 +2894,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return false; return false;
} }
void wipeDataLocked(int flags, String reason) { void wipeDataNoLock(int flags, String reason) {
// If the SD card is encrypted and non-removable, we have to force a wipe. // If the SD card is encrypted and non-removable, we have to force a wipe.
boolean forceExtWipe = !Environment.isExternalStorageRemovable() && isExtStorageEncrypted(); boolean forceExtWipe = !Environment.isExternalStorageRemovable() && isExtStorageEncrypted();
boolean wipeExtRequested = (flags&DevicePolicyManager.WIPE_EXTERNAL_STORAGE) != 0; boolean wipeExtRequested = (flags&DevicePolicyManager.WIPE_EXTERNAL_STORAGE) != 0;
@@ -2924,13 +2924,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return; return;
} }
enforceCrossUserPermission(userHandle); enforceCrossUserPermission(userHandle);
final String source;
synchronized (this) { synchronized (this) {
// This API can only be called by an active device admin, // This API can only be called by an active device admin,
// so try to retrieve it to check that the caller is one. // so try to retrieve it to check that the caller is one.
final ActiveAdmin admin = getActiveAdminForCallerLocked(null, final ActiveAdmin admin = getActiveAdminForCallerLocked(null,
DeviceAdminInfo.USES_POLICY_WIPE_DATA); DeviceAdminInfo.USES_POLICY_WIPE_DATA);
final String source;
if (admin != null && admin.info != null) { if (admin != null && admin.info != null) {
final ComponentName cname = admin.info.getComponent(); final ComponentName cname = admin.info.getComponent();
if (cname != null) { if (cname != null) {
@@ -2941,20 +2941,19 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} else { } else {
source = "?"; source = "?";
} }
}
long ident = Binder.clearCallingIdentity(); long ident = Binder.clearCallingIdentity();
try { try {
wipeDeviceOrUserLocked(flags, userHandle, wipeDeviceNoLock(flags, userHandle,
"DevicePolicyManager.wipeData() from " + source); "DevicePolicyManager.wipeData() from " + source);
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);
}
} }
} }
private void wipeDeviceOrUserLocked(int flags, final int userHandle, String reason) { private void wipeDeviceNoLock(int flags, final int userHandle, String reason) {
if (userHandle == UserHandle.USER_OWNER) { if (userHandle == UserHandle.USER_OWNER) {
wipeDataLocked(flags, reason); wipeDataNoLock(flags, reason);
} else { } else {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {
@@ -3106,7 +3105,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
if (wipeData) { if (wipeData) {
// Call without holding lock. // Call without holding lock.
wipeDeviceOrUserLocked(0, identifier, "reportFailedPasswordAttempt()"); wipeDeviceNoLock(0, identifier, "reportFailedPasswordAttempt()");
} }
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);