summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-07-30 16:51:27 +0100
committerNarayan Kamath <narayan@google.com>2014-07-31 11:29:44 +0000
commit08b3516984850e04e9bb6feae29d691a7557191c (patch)
tree37ccd583a47976846282007c1e4e04b622e144c8
parent6a58309e734086a21580dd8d9175ac1817ca3ab2 (diff)
downloadbase-08b3516984850e04e9bb6feae29d691a7557191c.tar.gz
Switch TextUtils over to new ICU API.
.. and use Locale.getScript() instead of ICU.getScript. bug: 15876704 Change-Id: Idf9462d8ef568dbc88c95e65a971184952e97872
-rw-r--r--core/java/android/text/TextUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java
index 596ca8c958ec..a5e62e159d1b 100644
--- a/core/java/android/text/TextUtils.java
+++ b/core/java/android/text/TextUtils.java
@@ -1737,7 +1737,7 @@ public class TextUtils {
*/
public static int getLayoutDirectionFromLocale(Locale locale) {
if (locale != null && !locale.equals(Locale.ROOT)) {
- final String scriptSubtag = ICU.getScript(ICU.addLikelySubtags(locale.toString()));
+ final String scriptSubtag = ICU.addLikelySubtags(locale).getScript();
if (scriptSubtag == null) return getLayoutDirectionFromFirstChar(locale);
if (scriptSubtag.equalsIgnoreCase(ARAB_SCRIPT_SUBTAG) ||