Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a ConcurrentModificationException when dumping resources" into tm-dev am: 6f08ee22f9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17037017

Change-Id: I75db7faa499c103a70836e75f1e14fe8c1b061e3
This commit is contained in:
Jeremy Meyer
2022-03-01 22:57:51 +00:00
committed by Automerger Merge Worker
parent e857d16dc0 6f08ee22f9
commit 208a7d3154
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/res/Resources.java
View File

@@ -2674,9 +2674,8 @@ public class Resources {
// Putting into a map keyed on the apk assets to deduplicate resources that are different
// objects but ultimately represent the same assets
Map<List<ApkAssets>, Resources> history = new ArrayMap<>();
for (Resources r : sResourcesHistory) {
history.put(Arrays.asList(r.mResourcesImpl.mAssets.getApkAssets()), r);
}
sResourcesHistory.forEach(
r -> history.put(Arrays.asList(r.mResourcesImpl.mAssets.getApkAssets()), r));
int i = 0;
for (Resources r : history.values()) {
if (r != null) {