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

Merge "Log wipe failure" into pi-dev

Browse Source
This commit is contained in:
Pavel Grafov
2018-05-09 19:46:05 +00:00
committed by Android (Google) Code Review
parent b9ab72bf96 a0d201b548
commit 9cf46fd625
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5908,35 +5908,41 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
private void forceWipeDeviceNoLock(boolean wipeExtRequested, String reason, boolean wipeEuicc) { private void forceWipeDeviceNoLock(boolean wipeExtRequested, String reason, boolean wipeEuicc) {
wtfIfInLock(); wtfIfInLock();
boolean success = false;
if (wipeExtRequested) {
StorageManager sm = (StorageManager) mContext.getSystemService(
Context.STORAGE_SERVICE);
sm.wipeAdoptableDisks();
}
try { try {
if (wipeExtRequested) {
StorageManager sm = (StorageManager) mContext.getSystemService(
Context.STORAGE_SERVICE);
sm.wipeAdoptableDisks();
}
mInjector.recoverySystemRebootWipeUserData( mInjector.recoverySystemRebootWipeUserData(
/*shutdown=*/ false, reason, /*force=*/ true, /*wipeEuicc=*/ wipeEuicc); /*shutdown=*/ false, reason, /*force=*/ true, /*wipeEuicc=*/ wipeEuicc);
success = true;
} catch (IOException | SecurityException e) { } catch (IOException | SecurityException e) {
Slog.w(LOG_TAG, "Failed requesting data wipe", e); Slog.w(LOG_TAG, "Failed requesting data wipe", e);
} finally {
if (!success) SecurityLog.writeEvent(SecurityLog.TAG_WIPE_FAILURE);
} }
} }
private void forceWipeUser(int userId, String wipeReasonForUser) { private void forceWipeUser(int userId, String wipeReasonForUser) {
boolean success = false;
try { try {
IActivityManager am = mInjector.getIActivityManager(); IActivityManager am = mInjector.getIActivityManager();
if (am.getCurrentUser().id == userId) { if (am.getCurrentUser().id == userId) {
am.switchUser(UserHandle.USER_SYSTEM); am.switchUser(UserHandle.USER_SYSTEM);
} }
boolean userRemoved = mUserManagerInternal.removeUserEvenWhenDisallowed(userId); success = mUserManagerInternal.removeUserEvenWhenDisallowed(userId);
if (!userRemoved) { if (!success) {
Slog.w(LOG_TAG, "Couldn't remove user " + userId); Slog.w(LOG_TAG, "Couldn't remove user " + userId);
} else if (isManagedProfile(userId)) { } else if (isManagedProfile(userId)) {
sendWipeProfileNotification(wipeReasonForUser); sendWipeProfileNotification(wipeReasonForUser);
} }
} catch (RemoteException re) { } catch (RemoteException re) {
// Shouldn't happen // Shouldn't happen
} finally {
if (!success) SecurityLog.writeEvent(SecurityLog.TAG_WIPE_FAILURE);
} }
} }