Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
am: 99cb9d91f1
am: 9f04b02571
am: 9a2052945a
am: 7b7c62d78a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981 Change-Id: I7b06e7905c0556428bf0453e7a7e8d35013a8b11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -135,12 +135,18 @@ 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;
|
||||
if (changedStorageEntry.equals(mSelectedStorageEntry)) {
|
||||
mSelectedStorageEntry = changedStorageEntry;
|
||||
}
|
||||
} else {
|
||||
if (changedStorageEntry.equals(mSelectedStorageEntry)) {
|
||||
mSelectedStorageEntry =
|
||||
StorageEntry.getDefaultInternalStorageEntry(getContext());
|
||||
}
|
||||
}
|
||||
refreshUi();
|
||||
break;
|
||||
|
Reference in New Issue
Block a user