Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" (6626e50d) · Commits · e / os / android_packages_apps_Settings

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

+11 −5

Original line number	Diff line number	Diff line
		@@ -135,13 +135,19 @@ public class StorageDashboardFragment extends DashboardFragment
		mStorageEntries.removeIf(storageEntry -> {
		return storageEntry.equals(changedStorageEntry);
		});
		if (volumeState != VolumeInfo.STATE_REMOVED
		&& volumeState != VolumeInfo.STATE_BAD_REMOVAL) {
		if (volumeState == VolumeInfo.STATE_MOUNTED
		\|\| volumeState == VolumeInfo.STATE_MOUNTED_READ_ONLY
		\|\| volumeState == VolumeInfo.STATE_UNMOUNTABLE) {
		mStorageEntries.add(changedStorageEntry);
		}
		if (changedStorageEntry.equals(mSelectedStorageEntry)) {
		mSelectedStorageEntry = changedStorageEntry;
		}
		} else {
		if (changedStorageEntry.equals(mSelectedStorageEntry)) {
		mSelectedStorageEntry =
		StorageEntry.getDefaultInternalStorageEntry(getContext());
		}
		}
		refreshUi();
		break;
		default: