Bug 1325446 - Remove "private tab" telemetry from Activity Stream r=liuche draft
authorGrisha Kruglov <gkruglov@mozilla.com>
Thu, 22 Dec 2016 11:57:42 -0800
changeset 453050 a8d73e4b5394be3e27a5831b64d05e46fde40682
parent 452782 b6206bba4f08c49917c389a94234ca4bc228e412
child 540365 3412f59aacda2634dcc3df5051b777afa53cd8f8
push id39557
push userbmo:gkruglov@mozilla.com
push dateThu, 22 Dec 2016 19:58:30 +0000
reviewersliuche
bugs1325446
milestone53.0a1
Bug 1325446 - Remove "private tab" telemetry from Activity Stream r=liuche MozReview-Commit-ID: JUHQOxGXvAu
mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java
mobile/android/docs/activitystreamtelemetry.rst
--- a/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java
+++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/ActivityStreamTelemetry.java
@@ -39,17 +39,16 @@ public class ActivityStreamTelemetry {
         public final static String ITEM_SHARE = "share";
         public final static String ITEM_ADD_BOOKMARK = "add_bookmark";
         public final static String ITEM_REMOVE_BOOKMARK = "remove_bookmark";
         public final static String ITEM_PIN = "pin";
         public final static String ITEM_UNPIN = "unpin";
         public final static String ITEM_COPY = "copy";
         public final static String ITEM_ADD_TO_HOMESCREEN = "homescreen";
         public final static String ITEM_NEW_TAB = "newtab";
-        public final static String ITEM_PRIVATE_TAB = "privatetab";
         public final static String ITEM_DISMISS = "dismiss";
         public final static String ITEM_DELETE_HISTORY = "delete";
     }
 
     /**
      * A helper class used for composing an 'extras' field. It encapsulates a holder of "global"
      * key/value pairs which will be present in every 'extras' constructed by this class, and a
      * static builder which is aware of Activity Stream telemetry needs.
@@ -107,24 +106,24 @@ public class ActivityStreamTelemetry {
                     case R.id.copy_url:
                         this.set(Contract.ITEM, Contract.ITEM_COPY);
                         break;
 
                     case R.id.add_homescreen:
                         this.set(Contract.ITEM, Contract.ITEM_ADD_TO_HOMESCREEN);
                         break;
 
+                    // Our current privacy guidelines do not allow us to write to disk
+                    // Private Browsing-only telemetry that could indicate that PB mode is used.
+                    // See Bug 1325323 for context.
+                    case R.id.open_new_private_tab:
                     case R.id.open_new_tab:
                         this.set(Contract.ITEM, Contract.ITEM_NEW_TAB);
                         break;
 
-                    case R.id.open_new_private_tab:
-                        this.set(Contract.ITEM, Contract.ITEM_PRIVATE_TAB);
-                        break;
-
                     case R.id.dismiss:
                         this.set(Contract.ITEM, Contract.ITEM_DISMISS);
                         break;
 
                     case R.id.delete:
                         this.set(Contract.ITEM, Contract.ITEM_DELETE_HISTORY);
                         break;
                 }
--- a/mobile/android/docs/activitystreamtelemetry.rst
+++ b/mobile/android/docs/activitystreamtelemetry.rst
@@ -82,18 +82,17 @@ extras: {
 Possible values for "item" key (names of menu items), in no particular order:
 - "share"
 - "add_bookmark"
 - "remove_bookmark"
 - "pin"
 - "unpin"
 - "copy"
 - "homescreen"
-- "newtab"
-- "privatetab"
+- "newtab" (private tab actions are collapsed into "newtab" telemetry due to our privacy guidelines)
 - "dismiss"
 - "delete"
 
 Full Examples
 =============
 Following examples of events are here to provide a better feel for the overall shape of telemetry data being recorded.
 
 1) User with an active Firefox Account clicked on a menu item for a "visited highlight":