[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Disable telemetry and experiments

commit 58ed6fff3b06e225b55d0af80ba399a0eba11e9e Author: Matthew Finkel <Matthew.Finkel@gmail.com> Date: Mon Apr 9 21:57:22 2018 +0000 Bug 25741 - TBA: Disable telemetry and experiments --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 0cf5aa15b0e1..ce2f1c5908b8 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -71,6 +71,7 @@ import android.widget.Button; import android.widget.ListView; import android.widget.ViewFlipper; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.DynamicToolbar.VisibilityTransition; import org.mozilla.gecko.Tabs.TabEvents; @@ -703,7 +704,11 @@ public class BrowserApp extends GeckoApp showSplashScreen = true; final SafeIntent intent = new SafeIntent(getIntent()); - final boolean isInAutomation = IntentUtils.getIsInAutomationFromEnvironment(intent); + // TBA: Disable Switchboard testing experiments and + // Telemetry-uploading by abusing the isInAutomation detection. + final boolean isInAutomation = + (IntentUtils.getIsInAutomationFromEnvironment(intent) + || AppConstants.isTorBrowser()); GeckoProfile.setIntentArgs(intent.getStringExtra("args"));
participants (1)
-
gk@torproject.org