commit 6626e50dd8833dbd5b604303ece18e941ab2bcd6
author Arc Wang <arcwang@google.com> Wed Sep 28 01:22:51 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 28 01:22:51 2022 +0000
tree 1b9864454761dafb5b29196d52c4e6d38ceb02af
parent 5419d3f04e8dcf13c51045f3d5a06dbd3773caa8
parent aa76620073e31271106ebbfc1ef8edee801e577d

Merge "Fix USB OTG hot plug out nndexOutOfBoundsException"

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

diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index a4cc513..1b38298 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -135,12 +135,18 @@
                     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;
+                        if (changedStorageEntry.equals(mSelectedStorageEntry)) {
+                            mSelectedStorageEntry = changedStorageEntry;
+                        }
+                    } else {
+                        if (changedStorageEntry.equals(mSelectedStorageEntry)) {
+                            mSelectedStorageEntry =
+                                    StorageEntry.getDefaultInternalStorageEntry(getContext());
+                        }
                     }
                     refreshUi();
                     break;