diff options
| author | Scott Mertz <scott@cyngn.com> | 2016-07-25 11:13:15 -0700 |
|---|---|---|
| committer | Scott Mertz <scott@cyngn.com> | 2016-07-25 14:28:45 -0700 |
| commit | 75c84499bde3e8e0555cd9fda1cde5d758a8b8d4 (patch) | |
| tree | 0d08d97e82c7082f4859151c61cdbdeb6aa72ca0 /services/core | |
| parent | 5d7b76ed75bb5ef6f1f8a0d72c684ed9c1d55040 (diff) | |
| download | frameworks_base-75c84499bde3e8e0555cd9fda1cde5d758a8b8d4.zip frameworks_base-75c84499bde3e8e0555cd9fda1cde5d758a8b8d4.tar.gz frameworks_base-75c84499bde3e8e0555cd9fda1cde5d758a8b8d4.tar.bz2 | |
Factory reset: Wipe media by default
These hidden APIs are called from some public APIs (DevicePolicyManager),
so we shouldn't change the default behavior.
The intent API should also be considered public, so change that as well.
FEIJ-1610
Change-Id: Ib9591c122dbe6168e7e237444c754b9608be0953
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/MasterClearReceiver.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/MasterClearReceiver.java b/services/core/java/com/android/server/MasterClearReceiver.java index 23556c0..3fa02ba 100644 --- a/services/core/java/com/android/server/MasterClearReceiver.java +++ b/services/core/java/com/android/server/MasterClearReceiver.java @@ -57,7 +57,7 @@ public class MasterClearReceiver extends BroadcastReceiver { @Override public void run() { try { - boolean wipeMedia = intent.getBooleanExtra(EXTRA_WIPE_MEDIA, false); + boolean wipeMedia = intent.getBooleanExtra(EXTRA_WIPE_MEDIA, true); RecoverySystem.rebootWipeUserData(context, shutdown, reason, wipeMedia); Log.wtf(TAG, "Still running after master clear?!"); } catch (IOException e) { |