diff options
| -rw-r--r-- | android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java | 3 | ||||
| -rw-r--r-- | icu4j/main/classes/collate/src/com/ibm/icu/text/AlphabeticIndex.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java b/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java index d65eee4da..68e9a2cd3 100644 --- a/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java +++ b/android_icu4j/src/main/java/android/icu/text/AlphabeticIndex.java @@ -504,7 +504,8 @@ public final class AlphabeticIndex<V> implements Iterable<Bucket<V>> { */ private void addIndexExemplars(ULocale locale) { UnicodeSet exemplars = LocaleData.getExemplarSet(locale, 0, LocaleData.ES_INDEX); - if (exemplars != null) { + // Android-changed: check for empty exemplar sets (http://b/64953401). + if (exemplars != null && !exemplars.isEmpty()) { initialLabels.addAll(exemplars); return; } diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/AlphabeticIndex.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/AlphabeticIndex.java index 6bbf99916..3ab4dd2b6 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/AlphabeticIndex.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/AlphabeticIndex.java @@ -523,7 +523,8 @@ public final class AlphabeticIndex<V> implements Iterable<Bucket<V>> { */ private void addIndexExemplars(ULocale locale) { UnicodeSet exemplars = LocaleData.getExemplarSet(locale, 0, LocaleData.ES_INDEX); - if (exemplars != null) { + // Android-changed: check for empty exemplar sets (http://b/64953401). + if (exemplars != null && !exemplars.isEmpty()) { initialLabels.addAll(exemplars); return; } |