diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-01 14:45:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-01 14:45:07 +0000 |
| commit | debad1c93a8d3969ac48ca2e8a0908b495c81cbf (patch) | |
| tree | 0f2ef89c4cc944a95bc21852131d3cf87b8cb1a4 /icu4j/main/classes | |
| parent | c98207ca6ad0232486b01501f1ed30017f47799c (diff) | |
| parent | 917e8dade7a9c12e88dd65c6cebd7bf74d0ad1ec (diff) | |
| download | icu-debad1c93a8d3969ac48ca2e8a0908b495c81cbf.tar.gz | |
Merge "Fix AlphabeticIndex.addIndexExemplars."
Diffstat (limited to 'icu4j/main/classes')
| -rw-r--r-- | icu4j/main/classes/collate/src/com/ibm/icu/text/AlphabeticIndex.java | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |