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

Merge "Rename API fromResources to fromContextIgnoringOverride"

Browse Source
This commit is contained in:
Josh Hou
2023-01-12 01:31:53 +00:00
committed by Android (Google) Code Review
parent dec4353b15 a424cdc3b3
commit f31bd18fe9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -5905,7 +5905,7 @@ package android.app {
ctor public LocaleConfig(@NonNull android.content.Context);
ctor public LocaleConfig(@NonNull android.os.LocaleList);
method public int describeContents();
method @NonNull public static android.app.LocaleConfig fromResources(@NonNull android.content.Context);
method @NonNull public static android.app.LocaleConfig fromContextIgnoringOverride(@NonNull android.content.Context);
method public int getStatus();
method @Nullable public android.os.LocaleList getSupportedLocales();
method public void writeToParcel(@NonNull android.os.Parcel, int);

2
core/java/android/app/LocaleConfig.java
View File

@@ -110,7 +110,7 @@ public class LocaleConfig implements Parcelable {
* @see Context#createPackageContext(String, int).
*/
@NonNull
public static LocaleConfig fromResources(@NonNull Context context) {
public static LocaleConfig fromContextIgnoringOverride(@NonNull Context context) {
return new LocaleConfig(context, false);
}