Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb70e381 authored by Maurice Lam's avatar Maurice Lam Committed by android-build-merger
Browse files

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

am: 1f4e4e43

Change-Id: Ie81c1f7ca45906227e7f7195778bce723981b186
parents 1a17f08c 1f4e4e43

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34595,6 +34595,7 @@ package android.os { 
    method @Nullable public java.util.Locale getFirstMatch(String[]);

    method @IntRange(from=0xffffffff) public int indexOf(java.util.Locale);

    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 @IntRange(from=0) public int size();

    method @NonNull public String toLanguageTags();

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -5373,10 +5373,6 @@ package android.os { 
    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 {















    ctor public NativeHandle();















    ctor public NativeHandle(@NonNull java.io.FileDescriptor, boolean);

































core/java/android/os/LocaleList.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -20,7 +20,6 @@ import android.annotation.IntRange;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.Size;













import android.annotation.SystemApi;















import android.annotation.UnsupportedAppUsage;















import android.content.LocaleProto;















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.













     * {@hide}















     */













    @SystemApi















    public static boolean isPseudoLocale(@Nullable ULocale locale) {















        return isPseudoLocale(locale != null ? locale.toLocale() : null);















    }