Bug 1287387 - Remove FENNEC_RESTRICTED_PROFILE_RESTRICTIONS histogram. r=liuche draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Tue, 23 Aug 2016 15:38:59 +0200
changeset 404479 c15a2e63ea12dc8612c8dc484eaf1f6dcebb782a
parent 404478 bc9d0432f9d32524eaa479e691ddcabca0226890
child 529188 f4a4e748c39a47a5c69e57f27b416a8f6fdab712
push id27213
push users.kaspari@gmail.com
push dateTue, 23 Aug 2016 14:31:10 +0000
reviewersliuche
bugs1287387
milestone51.0a1
Bug 1287387 - Remove FENNEC_RESTRICTED_PROFILE_RESTRICTIONS histogram. r=liuche MozReview-Commit-ID: CvSLLCAACZv
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
toolkit/components/telemetry/Histograms.json
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1756,23 +1756,16 @@ public class BrowserApp extends GeckoApp
             final boolean hasCustomHomepanels = prefs.contains(HomeConfigPrefsBackend.PREFS_CONFIG_KEY) || prefs.contains(HomeConfigPrefsBackend.PREFS_CONFIG_KEY_OLD);
             Telemetry.addToHistogram("FENNEC_HOMEPANELS_CUSTOM", hasCustomHomepanels ? 1 : 0);
 
             Telemetry.addToHistogram("FENNEC_READER_VIEW_CACHE_SIZE", SavedReaderViewHelper.getSavedReaderViewHelper(getContext()).getDiskSpacedUsedKB());
 
             if (Versions.feature16Plus) {
                 Telemetry.addToHistogram("BROWSER_IS_ASSIST_DEFAULT", (isDefaultBrowser(Intent.ACTION_ASSIST) ? 1 : 0));
             }
-
-            if (Restrictions.isRestrictedProfile(this)) {
-                for (Restrictable rest : RestrictedProfileConfiguration.getVisibleRestrictions()) {
-                    int value = Restrictions.isAllowed(this, rest) ? 1 : 0;
-                    Telemetry.addToKeyedHistogram("FENNEC_RESTRICTED_PROFILE_RESTRICTIONS", rest.name(), value);
-                }
-            }
         } else if ("Updater:Launch".equals(event)) {
             handleUpdaterLaunch();
         } else if ("Download:AndroidDownloadManager".equals(event)) {
             // Downloading via Android's download manager
 
             final String uri = message.getString("uri");
             final String filename = message.getString("filename");
             final String mimeType = message.getString("mimeType");
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -5611,25 +5611,16 @@
     "expires_in_version": "never",
     "kind": "exponential",
     "low": 10,
     "high": 20000,
     "n_buckets": 20,
     "description": "Time for a URL bar DB search to return (ms)",
     "cpp_guard": "ANDROID"
   },
-  "FENNEC_RESTRICTED_PROFILE_RESTRICTIONS": {
-    "expires_in_version": "50",
-    "kind": "enumerated",
-    "n_values": 30,
-    "description": "Whether various restrictions are set, keyed by restiction name",
-    "keyed": true,
-    "bug_numbers": [1218942],
-    "alert_emails": ["mobile-frontend@mozilla.com"]
-  },
   "FENNEC_STARTUP_TIME_GECKOREADY": {
     "expires_in_version": "never",
     "kind": "exponential",
     "low": 500,
     "high": 20000,
     "n_buckets": 20,
     "description": "Time for the Gecko:Ready message to arrive (ms)",
     "cpp_guard": "ANDROID"