Skip to content
Snippets Groups Projects
Verified Commit cde6642d authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright,chutten

Bug 1444275 introduced an assertion on the parent process to check that
the value of toolkit.telemetry.enabled is the expected one.
However, this expected value could be different from the one set and
locked e.g. in some forks. Therefore, the assertion prevented debug
builds from working in these cases.

Differential Revision: https://phabricator.services.mozilla.com/D195080
parent 3bb4e325
No related branches found
No related tags found
1 merge request!1061Bug 42998: Rebased stable onto 115.14.0esr
......@@ -3637,16 +3637,6 @@ void Preferences::SetupTelemetryPref() {
Preferences::Lock(kTelemetryPref);
}
static void CheckTelemetryPref() {
MOZ_ASSERT(!XRE_IsParentProcess());
// Make sure the children got passed the right telemetry pref details.
DebugOnly<bool> value;
MOZ_ASSERT(NS_SUCCEEDED(Preferences::GetBool(kTelemetryPref, &value)) &&
value == TelemetryPrefValue());
MOZ_ASSERT(Preferences::IsLocked(kTelemetryPref));
}
#endif // MOZ_WIDGET_ANDROID
/* static */
......@@ -3687,11 +3677,6 @@ already_AddRefed<Preferences> Preferences::GetInstanceForService() {
Preferences::SetPreference(gChangedDomPrefs->ElementAt(i));
}
gChangedDomPrefs = nullptr;
#ifndef MOZ_WIDGET_ANDROID
CheckTelemetryPref();
#endif
} else {
// Check if there is a deployment configuration file. If so, set up the
// pref config machinery, which will actually read the file.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment