Merge "Gracefully handle the case where private volume may be unmountable" into qt-dev (6dd38b46) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/StorageSettings.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -150,8 +150,6 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index

		mInternalCategory.addPreference(mInternalSummary);

		int privateCount = 0;

		final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(mStorageManager);
		final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(smvp);
		final long privateTotalBytes = info.totalBytes;
		@@ -162,10 +160,16 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index

		for (VolumeInfo vol : volumes) {
		if (vol.getType() == VolumeInfo.TYPE_PRIVATE) {

		if (vol.getState() == VolumeInfo.STATE_UNMOUNTABLE) {
		mInternalCategory.addPreference(
		new StorageVolumePreference(context, vol, 0));
		} else {
		final long volumeTotalBytes = PrivateStorageInfo.getTotalSize(vol,
		sTotalInternalStorage);
		mInternalCategory.addPreference(
		new StorageVolumePreference(context, vol, volumeTotalBytes));
		}
		} else if (vol.getType() == VolumeInfo.TYPE_PUBLIC
		\|\| vol.getType() == VolumeInfo.TYPE_STUB) {
		mExternalCategory.addPreference(