am fd845410: Merge "remove primary condition check on storage format." into klp-dev

* commit 'fd845410aa3b5b572e2d72bd7d97fb5b112fa3fd':
  remove primary condition check on storage format.
This commit is contained in:
Jeff Sharkey
2013-10-25 15:02:50 -07:00
committed by Android Git Automerger

View File

@@ -205,9 +205,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
addPreference(mMountTogglePreference); addPreference(mMountTogglePreference);
} }
// Only allow formatting of primary physical storage final boolean allowFormat = mVolume != null;
// TODO: enable for non-primary volumes once MTP is fixed
final boolean allowFormat = mVolume != null ? mVolume.isPrimary() : false;
if (allowFormat) { if (allowFormat) {
mFormatPreference = new Preference(context); mFormatPreference = new Preference(context);
mFormatPreference.setTitle(R.string.sd_format); mFormatPreference.setTitle(R.string.sd_format);