[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][base-browser-115.6.0esr-13.0-1] Bug 1860020 - Remove the assertion on the value of toolkit.telemetry.enabled. r=KrisWright, chutten



Title: GitLab

Pier Angelo Vendrame pushed to branch base-browser-115.6.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits:

  • ff2a5e97
    by Pier Angelo Vendrame at 2024-01-09T14:26:49+01:00
    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

1 changed file:

Changes:

  • modules/libpref/Preferences.cpp
    ... ... @@ -3637,16 +3637,6 @@ void Preferences::SetupTelemetryPref() {
    3637 3637
       Preferences::Lock(kTelemetryPref);
    
    3638 3638
     }
    
    3639 3639
     
    
    3640
    -static void CheckTelemetryPref() {
    
    3641
    -  MOZ_ASSERT(!XRE_IsParentProcess());
    
    3642
    -
    
    3643
    -  // Make sure the children got passed the right telemetry pref details.
    
    3644
    -  DebugOnly<bool> value;
    
    3645
    -  MOZ_ASSERT(NS_SUCCEEDED(Preferences::GetBool(kTelemetryPref, &value)) &&
    
    3646
    -             value == TelemetryPrefValue());
    
    3647
    -  MOZ_ASSERT(Preferences::IsLocked(kTelemetryPref));
    
    3648
    -}
    
    3649
    -
    
    3650 3640
     #endif  // MOZ_WIDGET_ANDROID
    
    3651 3641
     
    
    3652 3642
     /* static */
    
    ... ... @@ -3687,11 +3677,6 @@ already_AddRefed<Preferences> Preferences::GetInstanceForService() {
    3687 3677
           Preferences::SetPreference(gChangedDomPrefs->ElementAt(i));
    
    3688 3678
         }
    
    3689 3679
         gChangedDomPrefs = nullptr;
    
    3690
    -
    
    3691
    -#ifndef MOZ_WIDGET_ANDROID
    
    3692
    -    CheckTelemetryPref();
    
    3693
    -#endif
    
    3694
    -
    
    3695 3680
       } else {
    
    3696 3681
         // Check if there is a deployment configuration file. If so, set up the
    
    3697 3682
         // pref config machinery, which will actually read the file.
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits