diff options
| author | Xin Li <delphij@google.com> | 2022-08-15 22:03:38 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-08-15 22:03:38 -0700 |
| commit | cd1a1608ea64931183b89f3f946a12d682b3309b (patch) | |
| tree | 8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce | |
| parent | 89fb2b67974da43b9bf69adfcf0cc860af71733e (diff) | |
| parent | c4c7bd851ef29069681778cfedca27feb226003d (diff) | |
| download | localepicker-cd1a1608ea64931183b89f3f946a12d682b3309b.tar.gz | |
DO NOT MERGE - Merge Android 13android-platform-13.0.0_r1main-16kandroid13-platform-release
Bug: 242648940
Merged-In: I1eb7e02cc2b805b381f3dd3439ec68f958949e48
Change-Id: I66407585a3b3ca81edc7b7d6c3d6f860914dc151
| -rw-r--r-- | src/com/android/localepicker/LocaleStore.java | 5 |
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 |