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

Force storage wipe if not removable and encrypted

Browse Source 
Bug: 5017638
Change-Id: I43c98359eff7202437249675060ba964e1bd085c
This commit is contained in:
Ben Komalo
2011-09-07 16:42:34 -07:00
parent e5d6179291
commit 2a32192329
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/deviceinfo/Memory.java
View File

@@ -60,7 +60,7 @@ public class Memory extends SettingsPreferenceFragment {
// one's preference is disabled
private Preference mLastClickedMountToggle;
private String mClickedMountPoint;
// Access using getMountService()
private IMountService mMountService = null;
@@ -197,7 +197,7 @@ public class Memory extends SettingsPreferenceFragment {
}
return mMountService;
}
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
@@ -225,7 +225,7 @@ public class Memory extends SettingsPreferenceFragment {
return false;
}
private final BroadcastReceiver mMediaScannerReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -267,7 +267,7 @@ public class Memory extends SettingsPreferenceFragment {
mLastClickedMountToggle.setEnabled(false);
mLastClickedMountToggle.setTitle(mResources.getString(R.string.sd_ejecting_title));
mLastClickedMountToggle.setSummary(mResources.getString(R.string.sd_ejecting_summary));
mountService.unmountVolume(mClickedMountPoint, true);
mountService.unmountVolume(mClickedMountPoint, true, false);
} catch (RemoteException e) {
// Informative dialog to user that unmount failed.
showDialogInner(DLG_ERROR_UNMOUNT);