diff --git a/.prettierignore b/.prettierignore index 1468a586a0c9..4ba482e89873 100644 --- a/.prettierignore +++ b/.prettierignore @@ -31,7 +31,6 @@ modules/libpref/test/unit/extdata/testExt.js remote/pref/remote.js services/sync/tests/unit/prefs_test_prefs_store.js testing/marionette/prefs/marionette.js -toolkit/components/telemetry/healthreport-prefs.js # Ignore testing pref files which aren't parsed normally. testing/profiles/**/user.js diff --git a/mobile/android/installer/removed-files.in b/mobile/android/installer/removed-files.in index 855cb05388f1..125c8eb2e126 100644 --- a/mobile/android/installer/removed-files.in +++ b/mobile/android/installer/removed-files.in @@ -1,4 +1,3 @@ update.locale README.txt -defaults/preferences/healthreport-prefs.js components/dom_webspeech.xpt diff --git a/modules/libpref/greprefs.js b/modules/libpref/greprefs.js index cbe8d3be2d30..9fb53498f087 100644 --- a/modules/libpref/greprefs.js +++ b/modules/libpref/greprefs.js @@ -1,7 +1,2 @@ #include init/all.js #include ../../devtools/shared/preferences/devtools-shared.js -#ifdef MOZ_SERVICES_HEALTHREPORT -#if MOZ_WIDGET_TOOLKIT != android -#include ../../toolkit/components/telemetry/healthreport-prefs.js -#endif -#endif diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 1a3d6cdda6ce..a2491c79691e 100755 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5665,6 +5665,15 @@ pref("datareporting.policy.minimumPolicyVersion.channel-beta", 2); pref("datareporting.policy.firstRunURL", "https://www.mozilla.org/privacy/firefox/"); #endif +#ifdef MOZ_SERVICES_HEALTHREPORT +#if !defined(ANDROID) +pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report"); + +// Health Report is enabled by default on all channels. +pref("datareporting.healthreport.uploadEnabled", true); +#endif +#endif + pref("services.common.log.logger.rest.request", "Debug"); pref("services.common.log.logger.rest.response", "Debug"); pref("services.common.log.logger.tokenserverclient", "Debug"); diff --git a/toolkit/components/telemetry/docs/internals/preferences.rst b/toolkit/components/telemetry/docs/internals/preferences.rst index e264f137ba3f..49eca2952f44 100644 --- a/toolkit/components/telemetry/docs/internals/preferences.rst +++ b/toolkit/components/telemetry/docs/internals/preferences.rst @@ -28,7 +28,7 @@ mozconfig Defines When Defined (which it is on most platforms): - * includes ``toolkit/components/telemetry/healthreport-prefs.js`` (which sets ``datareporting.healthreport.{infoURL|uploadEnabled}``) + * Sets ``datareporting.healthreport.{infoURL|uploadEnabled}`` in ``modules/libpref/init/all.js``. ``MOZ_DATA_REPORTING`` diff --git a/toolkit/components/telemetry/healthreport-prefs.js b/toolkit/components/telemetry/healthreport-prefs.js deleted file mode 100644 index 4972df17e909..000000000000 --- a/toolkit/components/telemetry/healthreport-prefs.js +++ /dev/null @@ -1,10 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* global pref */ - -pref("datareporting.healthreport.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#health-report"); - -// Health Report is enabled by default on all channels. -pref("datareporting.healthreport.uploadEnabled", true);