From a424cdc3b3bd5b05e7929c009bfe8028b37347bc Mon Sep 17 00:00:00 2001
From: Josh Hou <joshhou@google.com>
Date: Wed, 11 Jan 2023 00:02:15 +0800
Subject: [PATCH] Rename API fromResources to fromContextIgnoringOverride

Bug: 265006884
Test: atest LocaleConfigTest
Change-Id: I46774030528ed38176a466709be5dd8f0b093ea3
---
 core/api/current.txt                    | 2 +-
 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 326a8e781a602..573574446b4b3 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -5887,7 +5887,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 50ba7dbbec85f..69693fc3977b2 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);
     }