Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make LocaleList.isPseudoLocale a public API" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 03:11:31 +00:00
committed by Android (Google) Code Review
parent 7deafd415b 52f378834d
commit 1f4e4e433d
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -34595,6 +34595,7 @@ package android.os {
method @Nullable public java.util.Locale getFirstMatch(String[]); method @Nullable public java.util.Locale getFirstMatch(String[]);
method @IntRange(from=0xffffffff) public int indexOf(java.util.Locale); method @IntRange(from=0xffffffff) public int indexOf(java.util.Locale);
method public boolean isEmpty(); method public boolean isEmpty();
method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);
method public static void setDefault(@NonNull @Size(min=1) android.os.LocaleList); method public static void setDefault(@NonNull @Size(min=1) android.os.LocaleList);
method @IntRange(from=0) public int size(); method @IntRange(from=0) public int size();
method @NonNull public String toLanguageTags(); method @NonNull public String toLanguageTags();

4
api/system-current.txt
View File

@@ -5373,10 +5373,6 @@ package android.os {
field @NonNull public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR;
} }
public final class LocaleList implements android.os.Parcelable {
method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);
}
public final class NativeHandle implements java.io.Closeable { public final class NativeHandle implements java.io.Closeable {
ctor public NativeHandle(); ctor public NativeHandle();
ctor public NativeHandle(@NonNull java.io.FileDescriptor, boolean); ctor public NativeHandle(@NonNull java.io.FileDescriptor, boolean);

3
core/java/android/os/LocaleList.java
View File

@@ -20,7 +20,6 @@ import android.annotation.IntRange;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.Size; import android.annotation.Size;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.content.LocaleProto; import android.content.LocaleProto;
import android.icu.util.ULocale; import android.icu.util.ULocale;
@@ -328,9 +327,7 @@ public final class LocaleList implements Parcelable {
/** /**
* Returns true if locale is a pseudo-locale, false otherwise. * Returns true if locale is a pseudo-locale, false otherwise.
* {@hide}
*/ */
@SystemApi
public static boolean isPseudoLocale(@Nullable ULocale locale) { public static boolean isPseudoLocale(@Nullable ULocale locale) {
return isPseudoLocale(locale != null ? locale.toLocale() : null); return isPseudoLocale(locale != null ? locale.toLocale() : null);
} }