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

am: 5fc179b22d Change-Id: I13a5780d407f596a7026d36d55130fa98eb0882f
2017-03-20 17:25:48 +00:00
parent 48be310e69 5fc179b22d
commit c1afeb2750
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
@@ -686,7 +686,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) {