Bug 945375 - Unconditionally return mSubmenu in GeckoMenuItem.getSubMenu() (r=rnewman)
authorLucas Rocha <lucasr@mozilla.com>
Thu, 05 Dec 2013 11:16:45 +0000
changeset 174641 2bd207736d7b96368839c4bbc85cfd024f2b9255
parent 174640 2fd38af5d110e7e88355b3451776932cc343d3a7
child 174642 57c170af6a2340b5acbd7fef13c06c05f3a57308
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs945375
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 945375 - Unconditionally return mSubmenu in GeckoMenuItem.getSubMenu() (r=rnewman)
mobile/android/base/menu/GeckoMenuItem.java
--- a/mobile/android/base/menu/GeckoMenuItem.java
+++ b/mobile/android/base/menu/GeckoMenuItem.java
@@ -137,21 +137,17 @@ public class GeckoMenuItem implements Me
 
     @Override
     public int getOrder() {
         return mOrder;
     }
 
     @Override
     public SubMenu getSubMenu() {
-        // For consistency with hasSubMenu.
-        if (mActionProvider == null) {
-            return mSubMenu;
-        }
-        return null;
+        return mSubMenu;
     }
 
     @Override
     public CharSequence getTitle() {
         return mTitle;
     }
 
     @Override