diff options
| author | Victor Chang <vichang@google.com> | 2019-11-13 16:20:28 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2019-11-13 16:20:28 +0000 |
| commit | 95cd9077579b2af7a6031b1b951a6793f68623e8 (patch) | |
| tree | b1cf4b9b8d4c27615889814a96a0546420dcf4b2 /libart | |
| parent | a79eeb5cd6c8a748c824555d66a50da00f94d853 (diff) | |
Move ICU.toLower/UpperCase into external/icu
Bug: 138994281
Test: m droid
Change-Id: I18b8058fa4d174d8e1c1e813dad739ec7d1ce3fe
Diffstat (limited to 'libart')
| -rw-r--r-- | libart/src/main/java/java/lang/CaseMapper.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libart/src/main/java/java/lang/CaseMapper.java b/libart/src/main/java/java/lang/CaseMapper.java index 66d5030857..04eef0939a 100644 --- a/libart/src/main/java/java/lang/CaseMapper.java +++ b/libart/src/main/java/java/lang/CaseMapper.java @@ -17,8 +17,8 @@ package java.lang; import android.icu.text.Transliterator; +import com.android.icu.util.CaseMapperNative; import java.util.Locale; -import libcore.icu.ICU; /** * Performs case operations as described by http://unicode.org/reports/tr21/tr21-5.html. @@ -47,7 +47,7 @@ class CaseMapper { // Note that Greek isn't a particularly hard case for toLowerCase, only toUpperCase. String languageCode = locale.getLanguage(); if (languageCode.equals("tr") || languageCode.equals("az") || languageCode.equals("lt")) { - return ICU.toLowerCase(s, locale); + return CaseMapperNative.toLowerCase(s, locale); } char[] newValue = null; @@ -56,7 +56,7 @@ class CaseMapper { char newCh; if (ch == LATIN_CAPITAL_I_WITH_DOT || Character.isHighSurrogate(ch)) { // Punt these hard cases. - return ICU.toLowerCase(s, locale); + return CaseMapperNative.toLowerCase(s, locale); } else if (ch == GREEK_CAPITAL_SIGMA && isFinalSigma(s, i)) { newCh = GREEK_SMALL_FINAL_SIGMA; } else { @@ -146,7 +146,7 @@ class CaseMapper { public static String toUpperCase(Locale locale, String s, int count) { String languageCode = locale.getLanguage(); if (languageCode.equals("tr") || languageCode.equals("az") || languageCode.equals("lt")) { - return ICU.toUpperCase(s, locale); + return CaseMapperNative.toUpperCase(s, locale); } if (languageCode.equals("el")) { return EL_UPPER.get().transliterate(s); @@ -157,7 +157,7 @@ class CaseMapper { for (int o = 0; o < count; o++) { char ch = s.charAt(o); if (Character.isHighSurrogate(ch)) { - return ICU.toUpperCase(s, locale); + return CaseMapperNative.toUpperCase(s, locale); } int index = upperIndex(ch); if (index == -1) { |