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

Commit f144fc50 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by android-build-merger
Browse files

Merge "Unhide LocaleList.getAdjustedDefault()" into nyc-dev 

am: fa207d60

* commit 'fa207d60':
  Unhide LocaleList.getAdjustedDefault()
parents 883df3c5 fa207d60

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40090,6 +40090,7 @@ package android.util { 
    method public int describeContents();

    method public int describeContents();

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public java.util.Locale get(int);

    method public java.util.Locale get(int);

    method public static android.util.LocaleList getAdjustedDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public java.util.Locale getFirstMatch(java.lang.String[]);

    method public java.util.Locale getFirstMatch(java.lang.String[]);

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -42857,6 +42857,7 @@ package android.util { 
    method public int describeContents();

    method public int describeContents();

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public java.util.Locale get(int);

    method public java.util.Locale get(int);

    method public static android.util.LocaleList getAdjustedDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public java.util.Locale getFirstMatch(java.lang.String[]);

    method public java.util.Locale getFirstMatch(java.lang.String[]);

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40109,6 +40109,7 @@ package android.util { 
    method public int describeContents();

    method public int describeContents();

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public static android.util.LocaleList forLanguageTags(java.lang.String);

    method public java.util.Locale get(int);

    method public java.util.Locale get(int);

    method public static android.util.LocaleList getAdjustedDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getDefault();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public static android.util.LocaleList getEmptyLocaleList();

    method public java.util.Locale getFirstMatch(java.lang.String[]);

    method public java.util.Locale getFirstMatch(java.lang.String[]);

core/java/android/util/LocaleList.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -478,8 +478,6 @@ public final class LocaleList implements Parcelable { 
    /**

    /**

     * Returns the default locale list, adjusted by moving the default locale to its first

     * Returns the default locale list, adjusted by moving the default locale to its first

     * position.

     * position.

     *

     * {@hide}

     */

     */

    @NonNull @Size(min=1)

    @NonNull @Size(min=1)

    public static LocaleList getAdjustedDefault() {

    public static LocaleList getAdjustedDefault() {