diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/LocaleConfig.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 825e73bd4aac..06f0b8f4d5f1 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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); diff --git a/core/java/android/app/LocaleConfig.java b/core/java/android/app/LocaleConfig.java index 50ba7dbbec85..69693fc3977b 100644 --- a/core/java/android/app/LocaleConfig.java +++ b/core/java/android/app/LocaleConfig.java @@ -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); } |