commit 4cdcf93a74e6226117b87546cd4c89b818b50331
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 09 07:15:48 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 09 07:15:48 2022 +0000
tree 8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce
parent d77b797aa56f64bbb99ca532c16d0112a97841fe
parent 245fadb7cda4feb035a343b4aa9d3762a281a03b

Snap for 8701348 from 245fadb7cda4feb035a343b4aa9d3762a281a03b to mainline-uwb-release

Change-Id: I4894359c66dd221f956dd89093df2fc2f288c275

src/com/android/localepicker/LocaleStore.java

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 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 @@
         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