2022-01-14 05:21:34 -05:00
|
|
|
diff --git a/browser/moz.configure b/browser/moz.configure
|
2024-08-10 05:21:15 -05:00
|
|
|
index e605019172ad..73268e5d353d 100644
|
2022-01-14 05:21:34 -05:00
|
|
|
--- a/browser/moz.configure
|
|
|
|
|
+++ b/browser/moz.configure
|
|
|
|
|
@@ -5,11 +5,11 @@
|
|
|
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
|
|
|
|
|
|
imply_option("MOZ_PLACES", True)
|
|
|
|
|
-imply_option("MOZ_SERVICES_HEALTHREPORT", True)
|
|
|
|
|
+imply_option("MOZ_SERVICES_HEALTHREPORT", False)
|
|
|
|
|
imply_option("MOZ_SERVICES_SYNC", True)
|
|
|
|
|
imply_option("MOZ_DEDICATED_PROFILES", True)
|
|
|
|
|
imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
|
|
|
|
|
-imply_option("MOZ_NORMANDY", True)
|
|
|
|
|
+imply_option("MOZ_NORMANDY", False)
|
2024-08-10 05:21:15 -05:00
|
|
|
imply_option("MOZ_PROFILE_MIGRATOR", True)
|
|
|
|
|
|
2022-01-14 05:21:34 -05:00
|
|
|
|
2024-05-18 05:01:40 -05:00
|
|
|
diff --git a/python/mach/mach/telemetry.py b/python/mach/mach/telemetry.py
|
2024-08-10 05:21:15 -05:00
|
|
|
index 40d5cc221644..36db9a9e45b1 100644
|
2024-05-18 05:01:40 -05:00
|
|
|
--- a/python/mach/mach/telemetry.py
|
|
|
|
|
+++ b/python/mach/mach/telemetry.py
|
2024-08-10 05:21:15 -05:00
|
|
|
@@ -98,10 +98,7 @@ def is_applicable_telemetry_environment():
|
2024-05-18 05:01:40 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_telemetry_enabled(settings):
|
|
|
|
|
- if os.environ.get("DISABLE_TELEMETRY") == "1":
|
|
|
|
|
- return False
|
|
|
|
|
-
|
|
|
|
|
- return settings.mach_telemetry.is_enabled
|
|
|
|
|
+ return False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def arcrc_path():
|
