From c20caf23ac75d4e23b3530637da381ff3360a711 Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Thu, 16 Apr 2020 01:17:23 -0700 Subject: [PATCH] Only show multi-e10s setting for debug builds (#3153) --- .../org/mozilla/vrbrowser/browser/engine/SessionUtils.java | 7 +++++-- .../ui/widgets/settings/DeveloperOptionsView.java | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionUtils.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionUtils.java index 8586d98fe..d9913d941 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionUtils.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionUtils.java @@ -8,6 +8,7 @@ import androidx.annotation.Nullable; import org.mozilla.gecko.GeckoProfile; +import org.mozilla.vrbrowser.BuildConfig; import org.mozilla.vrbrowser.browser.SettingsStore; import org.mozilla.vrbrowser.utils.SystemUtils; @@ -43,8 +44,10 @@ public static void vrPrefsWorkAround(Context aContext, Bundle aExtras) { // Disable WebRender until it works with FxR out.write("pref(\"gfx.webrender.force-disabled\", true);\n".getBytes()); out.write("pref(\"signon.rememberSignons\", false);\n".getBytes()); - int processCount = SettingsStore.getInstance(aContext).isMultiE10s() ? 3 : 1; - out.write(("pref(\"dom.ipc.processCount\", " + processCount + ");\n").getBytes()); + if (BuildConfig.DEBUG) { + int processCount = SettingsStore.getInstance(aContext).isMultiE10s() ? 3 : 1; + out.write(("pref(\"dom.ipc.processCount\", " + processCount + ");\n").getBytes()); + } int msaa = SettingsStore.getInstance(aContext).getMSAALevel(); if (msaa > 0) { int msaaLevel = msaa == 2 ? 4 : 2; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java index 69f095e9d..225d6ecab 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DeveloperOptionsView.java @@ -69,12 +69,13 @@ protected void updateUI() { mBinding.bypassCacheOnReloadSwitch.setOnCheckedChangeListener(mBypassCacheOnReloadListener); setBypassCacheOnReload(SettingsStore.getInstance(getContext()).isBypassCacheOnReloadEnabled(), false); - mBinding.multiE10sSwitch.setOnCheckedChangeListener(mMultiE10sListener); - setMultiE10s(SettingsStore.getInstance(getContext()).isMultiE10s(), false); - if (BuildConfig.DEBUG) { mBinding.debugLoggingSwitch.setVisibility(View.GONE); + mBinding.multiE10sSwitch.setOnCheckedChangeListener(mMultiE10sListener); + setMultiE10s(SettingsStore.getInstance(getContext()).isMultiE10s(), false); } else { + mBinding.multiE10sSwitch.setVisibility(View.GONE); + mBinding.debugLoggingSwitch.setOnCheckedChangeListener(mDebugLogginListener); setDebugLogging(SettingsStore.getInstance(getContext()).isDebugLoggingEnabled(), false); }