Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus"

Browse Source
This commit is contained in:
Adam Powell
2011-08-22 16:35:44 -07:00
committed by Android (Google) Code Review
parent c2d256b415 70e9f4bd2c
commit 0ddc899dc5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/view/menu/ActionMenuPresenter.java
View File

@@ -252,7 +252,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter {
* @return true if the overflow menu was shown, false otherwise.
*/
public boolean showOverflowMenu() {
if (mReserveOverflow && !isOverflowMenuShowing() && mMenuView != null &&
if (mReserveOverflow && !isOverflowMenuShowing() && mMenu != null && mMenuView != null &&
mPostedOpenRunnable == null) {
OverflowPopup popup = new OverflowPopup(mContext, mMenu, mOverflowButton, true);
mPostedOpenRunnable = new OpenOverflowRunnable(popup);