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

am: c27cc4041b Change-Id: I35a5dd3715d64316672b77ca79d69e2269f82cf6
2019-11-21 04:12:33 -08:00
parent 394c2479d5 c27cc4041b
commit 35f3e83e87
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/app/LocaleHelper.java
+++ b/core/java/com/android/internal/app/LocaleHelper.java
@@ -208,7 +208,7 @@ public class LocaleHelper {
     * @return the maximized Locale instance.
     */
    public static Locale addLikelySubtags(Locale locale) {
-        return libcore.icu.ICU.addLikelySubtags(locale);
+        return ULocale.addLikelySubtags(ULocale.forLocale(locale)).toLocale();
    }

    /**