Merge "Fix crash issue on Storage Manager app" am: cb4a3c55cf

am: 69be98ae52 Change-Id: Iaa7f97df590cbf93e1d5c942dae5f3be55988f11
2017-03-20 17:18:40 +00:00
parent 06659047f0 69be98ae52
commit 5fc179b22d
1 changed files with 5 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -649,7 +649,11 @@ public class ApplicationsState {
            }

            if (comparator != null) {
-                Collections.sort(filteredApps, comparator);
+                synchronized (mEntriesMap) {
+                    // Locking to ensure that the background handler does not mutate
+                    // the size of AppEntries used for ordering while sorting.
+                    Collections.sort(filteredApps, comparator);
+                }
            }

            synchronized (mRebuildSync) {