[tbb-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Disable telemetry and experiments

[gk at torproject.org]

commit bb1e2de8f19b000acd81f15ea2e0d19ba276b11d
Author: Matthew Finkel <Matthew.Finkel at 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 80981eb87136..e7d490a552fe 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -64,6 +64,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;
@@ -631,7 +632,11 @@ public class BrowserApp extends GeckoApp
         showSplashScreen = true;
 
         safeStartingIntent = new SafeIntent(getIntent());
-        isInAutomation = IntentUtils.getIsInAutomationFromEnvironment(safeStartingIntent);
+        // TBA: Disable Switchboard testing experiments and
+        // Telemetry-uploading by abusing the isInAutomation detection.
+        isInAutomation =
+          (IntentUtils.getIsInAutomationFromEnvironment(safeStartingIntent)
+           || AppConstants.isTorBrowser());
 
         GeckoProfile.setIntentArgs(safeStartingIntent.getStringExtra("args"));