diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-25 07:31:26 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-25 07:31:27 -0700 |
| commit | fd63c85742f4b12065418d48ae10be4bb12468f5 (patch) | |
| tree | 0734c2e18753de13a9cdbb87fde1cc4ec49f7577 /services | |
| parent | d4cb08df751e29338f4df1a76b303aa720f2bc00 (diff) | |
| parent | f535cb04f08575d29118fab0342b1e6274091734 (diff) | |
| download | frameworks_base-fd63c85742f4b12065418d48ae10be4bb12468f5.zip frameworks_base-fd63c85742f4b12065418d48ae10be4bb12468f5.tar.gz frameworks_base-fd63c85742f4b12065418d48ae10be4bb12468f5.tar.bz2 | |
Merge "Wipe the user data out in any case."
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/DevicePolicyManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index d8e3d59..c7158aa 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -1684,6 +1684,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // Note: we can only do the wipe via ExternalStorageFormatter if the volume is not emulated. if ((forceExtWipe || wipeExtRequested) && !Environment.isExternalStorageEmulated()) { Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET); + intent.putExtra(ExternalStorageFormatter.EXTRA_ALWAYS_RESET, true); intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME); mWakeLock.acquire(10000); mContext.startService(intent); |