commit 35f3e83e8799cecf1f0237af6428434ef1034a51
author vichang <vichang@google.com> Thu Nov 21 04:12:33 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 21 04:12:33 2019 -0800
tree 3b1bd742949556926a648657b54ce11e26986e64
parent 394c2479d5b23d962bbbbd550d7a47ed1eb0ec53
parent c27cc4041b396c30e3c274141a06648f89e055c1

Merge "Deprecate the use of ICU.addLikelySubtags" am: 986c242b7a
am: c27cc4041b

Change-Id: I35a5dd3715d64316672b77ca79d69e2269f82cf6

core/java/com/android/internal/app/LocaleHelper.java

diff --git a/core/java/com/android/internal/app/LocaleHelper.java b/core/java/com/android/internal/app/LocaleHelper.java
index aef4dbf..e3d07aa 100644
--- a/core/java/com/android/internal/app/LocaleHelper.java
+++ b/core/java/com/android/internal/app/LocaleHelper.java
@@ -208,7 +208,7 @@
      * @return the maximized Locale instance.
      */
     public static Locale addLikelySubtags(Locale locale) {
-        return libcore.icu.ICU.addLikelySubtags(locale);
+        return ULocale.addLikelySubtags(ULocale.forLocale(locale)).toLocale();
     }
 
     /**