diff options
author | Cyril Lee <cyrillee@google.com> | 2022-05-04 06:34:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-04 06:34:06 +0000 |
commit | a6448a12de0ad3f81320679d9c71d45e9a6b9b94 (patch) | |
tree | 8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce | |
parent | d77b797aa56f64bbb99ca532c16d0112a97841fe (diff) | |
parent | fa53f6ee90425b3f31f4dbe621e65efd7754821e (diff) | |
download | localepicker-a6448a12de0ad3f81320679d9c71d45e9a6b9b94.tar.gz |
Fix getLevelLocales crash due to modify collection during iteration am: fa53f6ee90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/18124562
Change-Id: Ifff228eed55f695a43e80684d22888ae412f082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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 |