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

Commit 208a7d31 authored by Jeremy Meyer's avatar Jeremy Meyer Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I75db7faa499c103a70836e75f1e14fe8c1b061e3
parents e857d16d 6f08ee22

core/java/android/content/res/Resources.java

+2 −3
Original line number Diff line number Diff line
@@ -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) {