PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

Browse Source
This commit is contained in:
Rubin Xu
2015-06-30 14:05:31 +00:00
committed by Android (Google) Code Review
parent 6799ef423b ccbdc57ee7
commit 02c7e95fd4
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/MasterClearConfirm.java
View File

@@ -22,9 +22,7 @@ import android.content.pm.ActivityInfo;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.service.persistentdata.PersistentDataBlockManager; import android.service.persistentdata.PersistentDataBlockManager;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.os.storage.ExternalStorageFormatter;
import android.app.Fragment;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager; import android.os.UserManager;
@@ -111,19 +109,13 @@ public class MasterClearConfirm extends InstrumentedFragment {
}; };
private void doMasterClear() { 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 intent = new Intent(Intent.ACTION_MASTER_CLEAR);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm"); intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);
getActivity().sendBroadcast(intent); getActivity().sendBroadcast(intent);
// Intent handling is asynchronous -- assume it will happen soon. // Intent handling is asynchronous -- assume it will happen soon.
} }
}
/** /**
* Configure the UI for the final confirmation interaction * Configure the UI for the final confirmation interaction