diff options
| author | vichang <vichang@google.com> | 2019-11-21 11:25:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-21 11:25:28 +0000 |
| commit | ab6b304f0594bcdd8bc6f0653768ee0d7eafa49e (patch) | |
| tree | 81e45242d2377e876f0429928af3a7a42f401cd1 | |
| parent | ccbbae7bbbdbe317bbf267f139add5d035c2ad30 (diff) | |
| parent | 64194dcf9538a25982af877f07c7127a5fed675c (diff) | |
Merge "Remove ICU.addLikelySubtags from @CorePlatformApi"
| -rw-r--r-- | luni/src/main/java/libcore/icu/ICU.java | 10 | ||||
| -rw-r--r-- | mmodules/core_platform_api/api/platform/current-api.txt | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/luni/src/main/java/libcore/icu/ICU.java b/luni/src/main/java/libcore/icu/ICU.java index 4a31bfd703..a2a2bf2ad2 100644 --- a/luni/src/main/java/libcore/icu/ICU.java +++ b/luni/src/main/java/libcore/icu/ICU.java @@ -16,6 +16,7 @@ package libcore.icu; +import android.icu.util.ULocale; import dalvik.annotation.compat.UnsupportedAppUsage; import java.util.Collections; import java.util.HashMap; @@ -339,14 +340,19 @@ public final class ICU { public static native String getISO3Language(String languageTag); + /** + * @deprecated Use {@link android.icu.util.ULocale#addLikelySubtags(ULocale)} instead. + * The method is only kept for @UnsupportedAppUsage. + */ @UnsupportedAppUsage - @libcore.api.CorePlatformApi + @Deprecated public static Locale addLikelySubtags(Locale locale) { return Locale.forLanguageTag(addLikelySubtags(locale.toLanguageTag()).replace('_', '-')); } /** - * @deprecated use {@link #addLikelySubtags(java.util.Locale)} instead. + * @deprecated Use {@link android.icu.util.ULocale#addLikelySubtags(ULocale)} instead. + * The method is only kept for @UnsupportedAppUsage. */ @UnsupportedAppUsage @Deprecated diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt index fe99431f54..53c14c29e3 100644 --- a/mmodules/core_platform_api/api/platform/current-api.txt +++ b/mmodules/core_platform_api/api/platform/current-api.txt @@ -953,7 +953,6 @@ package libcore.icu { } public final class ICU { - method @dalvik.annotation.compat.UnsupportedAppUsage public static java.util.Locale addLikelySubtags(java.util.Locale); method @dalvik.annotation.compat.UnsupportedAppUsage public static String getBestDateTimePattern(String, java.util.Locale); method @dalvik.annotation.compat.UnsupportedAppUsage public static char[] getDateFormatOrder(String); } |