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

DO NOT MERGE Do not call RecoverySystem with DPMS lock held

Browse Source 
Bug 30681079

Change-Id: Ia832bed0f22396998d6307ab46e262dae9463838
This commit is contained in:
Suprabh Shukla
2017-01-30 18:02:18 -08:00
parent a206a0f17e
commit 8cdc04957a
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -2157,7 +2157,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
} }
void wipeDataLocked(int flags) { void wipeDataNoLock(int flags) {
// 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;
@@ -2188,18 +2188,18 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
// so try to retrieve it to check that the caller is one. // so try to retrieve it to check that the caller is one.
getActiveAdminForCallerLocked(null, getActiveAdminForCallerLocked(null,
DeviceAdminInfo.USES_POLICY_WIPE_DATA); DeviceAdminInfo.USES_POLICY_WIPE_DATA);
long ident = Binder.clearCallingIdentity(); }
try { long ident = Binder.clearCallingIdentity();
wipeDeviceOrUserLocked(flags, userHandle); try {
} finally { wipeDeviceNoLock(flags, userHandle);
Binder.restoreCallingIdentity(ident); } finally {
} Binder.restoreCallingIdentity(ident);
} }
} }
private void wipeDeviceOrUserLocked(int flags, final int userHandle) { private void wipeDeviceNoLock(int flags, final int userHandle) {
if (userHandle == UserHandle.USER_OWNER) { if (userHandle == UserHandle.USER_OWNER) {
wipeDataLocked(flags); wipeDataNoLock(flags);
} else { } else {
lockNowUnchecked(); lockNowUnchecked();
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@@ -2313,23 +2313,27 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
mContext.enforceCallingOrSelfPermission( mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.BIND_DEVICE_ADMIN, null); android.Manifest.permission.BIND_DEVICE_ADMIN, null);
synchronized (this) { long ident = Binder.clearCallingIdentity();
DevicePolicyData policy = getUserData(userHandle); try {
long ident = Binder.clearCallingIdentity(); boolean wipeData = false;
try { synchronized (this) {
DevicePolicyData policy = getUserData(userHandle);
policy.mFailedPasswordAttempts++; policy.mFailedPasswordAttempts++;
saveSettingsLocked(userHandle); saveSettingsLocked(userHandle);
if (mHasFeature) { if (mHasFeature) {
int max = getMaximumFailedPasswordsForWipe(null, userHandle); int max = getMaximumFailedPasswordsForWipe(null, userHandle);
if (max > 0 && policy.mFailedPasswordAttempts >= max) { if (max > 0 && policy.mFailedPasswordAttempts >= max) {
wipeDeviceOrUserLocked(0, userHandle); wipeData = true;
} }
sendAdminCommandLocked(DeviceAdminReceiver.ACTION_PASSWORD_FAILED, sendAdminCommandLocked(DeviceAdminReceiver.ACTION_PASSWORD_FAILED,
DeviceAdminInfo.USES_POLICY_WATCH_LOGIN, userHandle); DeviceAdminInfo.USES_POLICY_WATCH_LOGIN, userHandle);
} }
} finally {
Binder.restoreCallingIdentity(ident);
} }
if (wipeData) {
wipeDeviceNoLock(0, userHandle);
}
} finally {
Binder.restoreCallingIdentity(ident);
} }
} }