Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981 Change-Id: I2978b2a1b25c04d4cbac9022c3dc3ec651206bc6 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 -> {
|
mStorageEntries.removeIf(storageEntry -> {
|
||||||
return storageEntry.equals(changedStorageEntry);
|
return storageEntry.equals(changedStorageEntry);
|
||||||
});
|
});
|
||||||
if (volumeState != VolumeInfo.STATE_REMOVED
|
if (volumeState == VolumeInfo.STATE_MOUNTED
|
||||||
&& volumeState != VolumeInfo.STATE_BAD_REMOVAL) {
|
|| volumeState == VolumeInfo.STATE_MOUNTED_READ_ONLY
|
||||||
|
|| volumeState == VolumeInfo.STATE_UNMOUNTABLE) {
|
||||||
mStorageEntries.add(changedStorageEntry);
|
mStorageEntries.add(changedStorageEntry);
|
||||||
}
|
if (changedStorageEntry.equals(mSelectedStorageEntry)) {
|
||||||
if (changedStorageEntry.equals(mSelectedStorageEntry)) {
|
mSelectedStorageEntry = changedStorageEntry;
|
||||||
mSelectedStorageEntry = changedStorageEntry;
|
}
|
||||||
|
} else {
|
||||||
|
if (changedStorageEntry.equals(mSelectedStorageEntry)) {
|
||||||
|
mSelectedStorageEntry =
|
||||||
|
StorageEntry.getDefaultInternalStorageEntry(getContext());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
refreshUi();
|
refreshUi();
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user