Bug 1225102 - Stop recording addon telemetry details for GMP plugins. r=gfritzsche
authorNils Meinert <nm.mozilla@mailbox.org>
Mon, 25 Jan 2016 14:00:01 -0800
changeset 325606 e93d49248f6972e100d089aeeca10a0ab50e375c
parent 325605 7eb0141079d34b1b0c03101ba9dea8e41b6b0672
child 325607 f7e9ad668e37124bf15503f881f4868fb5df6a06
child 326033 d72dd9c03199a51afd01527d30576a8699e2a530
child 326034 167a51003ecd3e7834ba4e4d5aacfc9ad24da2a3
child 326036 fedba60ee85a23ce41ef23bed83231a4d1fca481
push id10011
push usercmanchester@mozilla.com
push dateTue, 26 Jan 2016 02:20:25 +0000
reviewersgfritzsche
bugs1225102
milestone46.0a1
Bug 1225102 - Stop recording addon telemetry details for GMP plugins. r=gfritzsche
toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -532,17 +532,16 @@ var GMPProvider = {
   get name() { return "GMPProvider"; },
 
   _plugins: null,
 
   startup: function() {
     configureLogging();
     this._log = Log.repository.getLoggerWithMessagePrefix("Toolkit.GMP",
                                                           "GMPProvider.");
-    let telemetry = {};
     this.buildPluginList();
     this.ensureProperCDMInstallState();
 
     Preferences.observe(GMPPrefs.KEY_LOG_BASE, configureLogging);
 
     for (let [id, plugin] of this._plugins) {
       let wrapper = plugin.wrapper;
       let gmpPath = wrapper.gmpPath;
@@ -573,24 +572,16 @@ var GMPProvider = {
           gmpService.addPluginDirectory(gmpPath);
         } catch (e) {
           if (e.name != 'NS_ERROR_NOT_AVAILABLE')
             throw e;
           this._log.warn("startup - adding gmp directory failed with " +
                          e.name + " - sandboxing not available?", e);
         }
       }
-
-      if (this.isEnabled) {
-        telemetry[id] = {
-          userDisabled: wrapper.userDisabled,
-          version: wrapper.version,
-          applyBackgroundUpdates: wrapper.applyBackgroundUpdates,
-        };
-      }
     }
 
     var emeEnabled = Preferences.get(GMPPrefs.KEY_EME_ENABLED, false);
     if (emeEnabled) {
       try {
         let greDir = Services.dirsvc.get(NS_GRE_DIR,
                                          Ci.nsILocalFile);
         let clearkeyPath = OS.Path.join(greDir.path,
@@ -598,18 +589,16 @@ var GMPProvider = {
                                         CLEARKEY_VERSION);
         this._log.info("startup - adding clearkey CDM directory " +
                        clearkeyPath);
         gmpService.addPluginDirectory(clearkeyPath);
       } catch (e) {
         this._log.warn("startup - adding clearkey CDM failed", e);
       }
     }
-
-    AddonManagerPrivate.setTelemetryDetails("GMP", telemetry);
   },
 
   shutdown: function() {
     this._log.trace("shutdown");
     Preferences.ignore(GMPPrefs.KEY_LOG_BASE, configureLogging);
 
     let shutdownTask = Task.spawn(function*() {
       this._log.trace("shutdown - shutdownTask");