commit ccbdc57ee768f291d062f3578953f5a53e37eaee
author Rubin Xu <rubinxu@google.com> Fri Jun 26 15:27:23 2015 +0100
committer Rubin Xu <rubinxu@google.com> Fri Jun 26 15:27:23 2015 +0100
tree c74dbd23ed52b1bb7f061c5625064c51d652e208
parent 91ba69df7e0fd7c3cc594e16a1d97339f769da09

No longer use ExternalStorageFormatter to format external storage

Bug: 9433509
Change-Id: I5723828de080df568937004157acf830ca190f81

src/com/android/settings/MasterClearConfirm.java

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 31f1bcc..37d9dd6 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -22,9 +22,7 @@
 import android.os.AsyncTask;
 import android.service.persistentdata.PersistentDataBlockManager;
 import com.android.internal.logging.MetricsLogger;
-import com.android.internal.os.storage.ExternalStorageFormatter;
 
-import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserManager;
@@ -111,18 +109,12 @@
     };
 
     private void doMasterClear() {
-        if (mEraseSdCard) {
-            Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET);
-            intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
-            intent.setComponent(ExternalStorageFormatter.COMPONENT_NAME);
-            getActivity().startService(intent);
-        } else {
-            Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR);
-            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-            intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
-            getActivity().sendBroadcast(intent);
-            // Intent handling is asynchronous -- assume it will happen soon.
-        }
+        Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR);
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
+        intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);
+        getActivity().sendBroadcast(intent);
+        // Intent handling is asynchronous -- assume it will happen soon.
     }
 
     /**