diff options
| author | Roman Birg <roman@cyngn.com> | 2015-05-27 12:13:23 -0700 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2015-06-03 00:22:16 +0000 |
| commit | 831e41008f92dece2b9be5303c4aeb790ecda4c4 (patch) | |
| tree | 1d14b114a01c4179762db50515390f1d3e3c52f9 | |
| parent | d6cd3ebcfdaf4effaf1202d02165807247cb5ada (diff) | |
| download | android_frameworks_base-831e41008f92dece2b9be5303c4aeb790ecda4c4.tar.gz android_frameworks_base-831e41008f92dece2b9be5303c4aeb790ecda4c4.tar.bz2 android_frameworks_base-831e41008f92dece2b9be5303c4aeb790ecda4c4.zip | |
ExternalStorageFormatter: pass whether to wipe internal storage
Change-Id: I90dc7f16216ef791fa2a002b01dedb32ff89fd16
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 083255596fa0ad445cf1ee223645ff3e2de10df6)
| -rw-r--r-- | core/java/com/android/internal/os/storage/ExternalStorageFormatter.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java b/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java index bbce8f81a5a..78fe95f25a0 100644 --- a/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java +++ b/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java @@ -41,6 +41,7 @@ public class ExternalStorageFormatter extends Service public static final String FORMAT_AND_FACTORY_RESET = "com.android.internal.os.storage.FORMAT_AND_FACTORY_RESET"; public static final String EXTRA_ALWAYS_RESET = "always_reset"; + public static final String EXTRA_WIPE_MEDIA = "wipe_media"; // If non-null, the volume to format. Otherwise, will use the default external storage directory private StorageVolume mStorageVolume; @@ -59,6 +60,7 @@ public class ExternalStorageFormatter extends Service private boolean mFactoryReset = false; private boolean mAlwaysReset = false; + private boolean mWipeInternalStorage = false; private String mReason = null; private boolean mIsFormatSuccess = false; @@ -94,6 +96,7 @@ public class ExternalStorageFormatter extends Service if (intent.getBooleanExtra(EXTRA_ALWAYS_RESET, false)) { mAlwaysReset = true; } + mWipeInternalStorage = intent.getBooleanExtra(EXTRA_WIPE_MEDIA, false); mReason = intent.getStringExtra(Intent.EXTRA_REASON); mStorageVolume = intent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME); @@ -277,6 +280,7 @@ public class ExternalStorageFormatter extends Service Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, mReason); + intent.putExtra(EXTRA_WIPE_MEDIA, mWipeInternalStorage); sendBroadcast(intent); // Intent handling is asynchronous -- assume it will happen soon. stopSelf(); @@ -289,6 +293,7 @@ public class ExternalStorageFormatter extends Service Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(Intent.EXTRA_REASON, mReason); + intent.putExtra(EXTRA_WIPE_MEDIA, mWipeInternalStorage); sendBroadcast(intent); } else { try { |