From 20f4564cfb76b5da6cc8876508355981958c3f1e Mon Sep 17 00:00:00 2001 From: MatthewTighe Date: Mon, 21 Mar 2022 12:47:29 -0700 Subject: [PATCH] [fenix] closes https://github.com/mozilla-mobile/fenix/issues/24366: reset strict mode after locale read --- .../fenix/perf/StartupExcessiveResourceUseTest.kt | 2 +- app/src/main/java/org/mozilla/fenix/FeatureFlags.kt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt b/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt index 577e7ba65e..68b361cddd 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt @@ -21,7 +21,7 @@ import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.HomeActivityTestRule // BEFORE INCREASING THESE VALUES, PLEASE CONSULT WITH THE PERF TEAM. -private const val EXPECTED_SUPPRESSION_COUNT = 19 +private const val EXPECTED_SUPPRESSION_COUNT = 20 @Suppress("TopLevelPropertyNaming") // it's silly this would have a different naming convention b/c no const private val EXPECTED_RUNBLOCKING_RANGE = 0..1 // CI has +1 counts compared to local runs: increment these together private const val EXPECTED_RECYCLER_VIEW_CONSTRAINT_LAYOUT_CHILDREN = 4 diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 740a60f7aa..75460e49ca 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -5,8 +5,10 @@ package org.mozilla.fenix import android.content.Context +import android.os.StrictMode import mozilla.components.support.locale.LocaleManager import mozilla.components.support.locale.LocaleManager.getSystemDefault +import org.mozilla.fenix.ext.components /** * A single source for setting feature flags that are mostly based on build type. @@ -91,9 +93,11 @@ object FeatureFlags { * Enables themed wallpapers feature. */ fun isThemedWallpapersFeatureEnabled(context: Context): Boolean { - val langTag = LocaleManager.getCurrentLocale(context) - ?.toLanguageTag() ?: getSystemDefault().toLanguageTag() - return listOf("en-US", "es-US").contains(langTag) + return context.components.strictMode.resetAfter(StrictMode.allowThreadDiskReads()) { + val langTag = LocaleManager.getCurrentLocale(context) + ?.toLanguageTag() ?: getSystemDefault().toLanguageTag() + listOf("en-US", "es-US").contains(langTag) + } } /**