Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b7c62d7 authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

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

Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50d am: 99cb9d91 am: 9f04b025 am: 9a205294

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981



Change-Id: I69f24f5a63070e84af70bd050dca789ef34b16ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4833fc2c 9a205294

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: