Commit efdee427 authored by Benjamin Smedberg's avatar Benjamin Smedberg
Browse files

Bug 986582 - Get rid of the toolkit.telemetry.enabledPreRelease pref and make... 

Bug 986582 - Get rid of the toolkit.telemetry.enabledPreRelease pref and make the toolkit.telemetry.enabled pref do the right thing for beta users who are testing a final release build, r=rnewman

--HG--
extra : rebase_source : 43f70e2c1c3207f37ba0789245958cb0c34187f6
parent 26c43cf1

browser/components/preferences/advanced.xul

+0 −4
Original line number Diff line number Diff line
@@ -54,11 +54,7 @@ 


#ifdef MOZ_TELEMETRY_REPORTING

      <preference id="toolkit.telemetry.enabled"

#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT

                  name="toolkit.telemetry.enabledPreRelease"

#else

                  name="toolkit.telemetry.enabled"

#endif

                  type="bool"/>

#endif

browser/components/preferences/in-content/advanced.xul

+0 −4
Original line number Diff line number Diff line
@@ -54,11 +54,7 @@ 


#ifdef MOZ_TELEMETRY_REPORTING

  <preference id="toolkit.telemetry.enabled"

#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT

              name="toolkit.telemetry.enabledPreRelease"

#else

              name="toolkit.telemetry.enabled"

#endif

              type="bool"/>

#endif

browser/experiments/Experiments.jsm

+1 −5
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ const PREF_HEALTHREPORT_ENABLED = "datareporting.healthreport.service.enabled"; 


const PREF_BRANCH_TELEMETRY     = "toolkit.telemetry.";

const PREF_TELEMETRY_ENABLED    = "enabled";

const PREF_TELEMETRY_PRERELEASE = "enabledPreRelease";



const TELEMETRY_LOG = {

  // log(key, [kind, experimentId, details])
@@ -167,8 +166,7 @@ function loadJSONAsync(file, options) { 
}



function telemetryEnabled() {

  return gPrefsTelemetry.get(PREF_TELEMETRY_ENABLED, false) ||

         gPrefsTelemetry.get(PREF_TELEMETRY_PRERELEASE, false);

  return gPrefsTelemetry.get(PREF_TELEMETRY_ENABLED, false);

}



// Returns a promise that is resolved with the AddonInstall for that URL.
@@ -357,7 +355,6 @@ Experiments.Experiments.prototype = { 
    gPrefs.observe(PREF_ENABLED, this._toggleExperimentsEnabled, this);



    gPrefsTelemetry.observe(PREF_TELEMETRY_ENABLED, this._telemetryStatusChanged, this);

    gPrefsTelemetry.observe(PREF_TELEMETRY_PRERELEASE, this._telemetryStatusChanged, this);



    AsyncShutdown.profileBeforeChange.addBlocker("Experiments.jsm shutdown",

      this.uninit.bind(this));
@@ -390,7 +387,6 @@ Experiments.Experiments.prototype = { 
      gPrefs.ignore(PREF_ENABLED, this._toggleExperimentsEnabled, this);



      gPrefsTelemetry.ignore(PREF_TELEMETRY_ENABLED, this._telemetryStatusChanged, this);

      gPrefsTelemetry.ignore(PREF_TELEMETRY_PRERELEASE, this._telemetryStatusChanged, this);



      if (this._timer) {

        this._timer.clear();

mobile/android/base/AppConstants.java.in

+0 −4
Original line number Diff line number Diff line
@@ -104,11 +104,7 @@ public class AppConstants { 
#endif



    public static final String TELEMETRY_PREF_NAME =

#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT

          "toolkit.telemetry.enabledPreRelease";

#else

          "toolkit.telemetry.enabled";

#endif



    public static final boolean MOZ_TELEMETRY_REPORTING =

#ifdef MOZ_TELEMETRY_REPORTING

mobile/android/base/preferences/GeckoPreferences.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class GeckoPreferences 
    private static final String PREFS_HOME_ADD_PANEL = NON_PREF_PREFIX + "home.add_panel";

    private static final String PREFS_ANNOUNCEMENTS_ENABLED = NON_PREF_PREFIX + "privacy.announcements.enabled";

    private static final String PREFS_DATA_REPORTING_PREFERENCES = NON_PREF_PREFIX + "datareporting.preferences";

    private static final String PREFS_TELEMETRY_ENABLED = "datareporting.telemetry.enabled";

    private static final String PREFS_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";

    private static final String PREFS_CRASHREPORTER_ENABLED = "datareporting.crashreporter.submitEnabled";

    private static final String PREFS_MENU_CHAR_ENCODING = "browser.menu.showCharacterEncoding";

    private static final String PREFS_MP_ENABLED = "privacy.masterpassword.enabled";