PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8

Browse Source 
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:
Arc Wang
2022-09-28 02:01:16 +00:00
committed by Automerger Merge Worker
parent 1b68f107cf 6626e50dd8
commit 99cb9d91f1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/deviceinfo/StorageDashboardFragment.java
View File

@@ -135,13 +135,19 @@ 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;
default: default: