Merge tm-dev-plus-aosp-without-vendor@8763363temp_sam_242648940

Bug: 236760014
Merged-In: I1eb7e02cc2b805b381f3dd3439ec68f958949e48
Change-Id: I11e48cc6ee69a0133ac2095307f7d36e563f7d6d

1 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/localepicker/LocaleStore.java b/src/com/android/localepicker/LocaleStore.java
index ff4f85a..c799bd3 100644
--- a/src/com/android/localepicker/LocaleStore.java
+++ b/src/com/android/localepicker/LocaleStore.java
@@ -27,9 +27,9 @@ import android.telephony.TelephonyManager;
 import androidx.annotation.VisibleForTesting;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.IllformedLocaleException;
 import java.util.Locale;
 import java.util.Set;
 
@@ -352,7 +352,8 @@ public class LocaleStore {
         String parentId = parent == null ? null : parent.getId();
 
         HashSet<LocaleInfo> result = new HashSet<>();
-        for (LocaleStore.LocaleInfo li : sLocaleCache.values()) {
+        ArrayList<LocaleStore.LocaleInfo> localeInfos = new ArrayList<>(sLocaleCache.values());
+        for (LocaleStore.LocaleInfo li : localeInfos) {
             int level = getLevel(ignorables, li, translatedOnly);
             if (level == 2) {
                 if (parent != null) { // region selection