Merge "Deprecate the use of ICU.addLikelySubtags"

am: 986c242b7a Change-Id: I86af54c4b0ca2d311a3ef1290972b47b5ddb0f8b
2019-11-21 04:05:33 -08:00
parent ed4371c546 986c242b7a
commit c27cc4041b
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();
    }

    /**