From ccbdc57ee768f291d062f3578953f5a53e37eaee Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Fri, 26 Jun 2015 15:27:23 +0100 Subject: [PATCH] No longer use ExternalStorageFormatter to format external storage Bug: 9433509 Change-Id: I5723828de080df568937004157acf830ca190f81 --- .../android/settings/MasterClearConfirm.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 31f1bcca521..37d9dd6379c 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -22,9 +22,7 @@ import android.content.pm.ActivityInfo; 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 @@ public class MasterClearConfirm extends InstrumentedFragment { }; 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. } /**