summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/app/ContextImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 08c18c8b7448..4f8e8dd813a1 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -3482,7 +3482,8 @@ class ContextImpl extends Context {
mResources = r;
// only do this if the user already has more than one preferred locale
- if (r.getConfiguration().getLocales().size() > 1) {
+ if (android.content.res.Flags.defaultLocale()
+ && r.getConfiguration().getLocales().size() > 1) {
LocaleConfig lc = getUserId() < 0
? LocaleConfig.fromContextIgnoringOverride(this)
: new LocaleConfig(this);