Backed out changesets 34516556f823 (bug 1004890) and 0610c2dcc6f5 (bug 1004889) for Android Armv6 robocop crashes.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 02 May 2014 15:21:14 -0400
changeset 181789 fb88b8685827e8562ad075d2c2a01137fd45c7cb
parent 181788 36853e536d681d12f535d27aca637be7a815b41d
child 181790 6a927b1634f666c450c6cfeff696cbbe7bd74ab1
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs1004890, 1004889
milestone32.0a1
backs out34516556f823394bb0822fa093c1bf3d62c85b63
Backed out changesets 34516556f823 (bug 1004890) and 0610c2dcc6f5 (bug 1004889) for Android Armv6 robocop crashes. CLOSED TREE
mobile/android/base/BrowserApp.java
mobile/android/base/TelemetryContract.java
mobile/android/base/home/HomeFragment.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -2345,20 +2345,16 @@ abstract public class BrowserApp extends
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Tab tab = null;
         Intent intent = null;
 
         final int itemId = item.getItemId();
 
-        // Track the menu action. We don't know much about the context, but we can use this to determine
-        // the frequency of use for various actions.
-        Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.MENU, getResources().getResourceEntryName(itemId));
-
         if (itemId == R.id.bookmark) {
             tab = Tabs.getInstance().getSelectedTab();
             if (tab != null) {
                 if (item.isChecked()) {
                     tab.removeBookmark();
                     Toast.makeText(this, R.string.bookmark_removed, Toast.LENGTH_SHORT).show();
                     item.setIcon(R.drawable.ic_menu_bookmark_add);
                 } else {
--- a/mobile/android/base/TelemetryContract.java
+++ b/mobile/android/base/TelemetryContract.java
@@ -41,19 +41,16 @@ public interface TelemetryContract {
         public static final String SAVE = "save.1";
 
         // Stop holding a resource (reader, bookmark, etc) for viewing later.
         // Note: Only used in JavaScript for now, but here for completeness.
         public static final String UNSAVE = "unsave.1";
 
         // Loading a URL.
         public static final String LOAD_URL = "loadurl.1";
-
-        // Generic action, usually for tracking menu and toolbar actions.
-        public static final String ACTION = "action.1";
     }
 
     /**
      * Holds event methods. Intended for use in
      * Telemetry.sendUIEvent() as the "method" parameter.
      */
     public interface Method {
         // Action triggered from a list.
@@ -63,19 +60,16 @@ public interface TelemetryContract {
         public static final String BUTTON = "button";
 
         // Action triggered from a dialog.
         public static final String DIALOG = "dialog";
 
         // Action occurred via an intent.
         public static final String INTENT = "intent";
 
-        // Action occurred via the main menu.
-        public static final String MENU = "menu";
-
         // Action occurred via a context menu.
         public static final String CONTEXT_MENU = "contextmenu";
 
         // Action triggered from a view grid item, like a thumbnail.
         public static final String GRID_ITEM = "griditem";
 
         // Action triggered from a view list item, like a row of a list.
         public static final String LIST_ITEM = "listitem";
--- a/mobile/android/base/home/HomeFragment.java
+++ b/mobile/android/base/home/HomeFragment.java
@@ -122,21 +122,16 @@ abstract class HomeFragment extends Frag
         if (menuInfo == null || !(menuInfo instanceof HomeContextMenuInfo)) {
             return false;
         }
 
         final HomeContextMenuInfo info = (HomeContextMenuInfo) menuInfo;
         final Context context = getActivity();
 
         final int itemId = item.getItemId();
-
-        // Track the menu action. We don't know much about the context, but we can use this to determine
-        // the frequency of use for various actions.
-        Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, TelemetryContract.Method.CONTEXT_MENU, getResources().getResourceEntryName(itemId));
-
         if (itemId == R.id.home_share) {
             if (info.url == null) {
                 Log.e(LOGTAG, "Can't share because URL is null");
                 return false;
             } else {
                 GeckoAppShell.openUriExternal(info.url, SHARE_MIME_TYPE, "", "",
                                               Intent.ACTION_SEND, info.getDisplayTitle());