From 70e9f4bd2c044858f3c1c040ffce973351a2383a Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 22 Aug 2011 16:31:24 -0700
Subject: [PATCH] Fix bug 5189070 - Don't try to show overflow popups for
 nonexistant menus

Change-Id: I9db43211cdece81063fc1d3c3324f1e166f27b0c
---
 .../com/android/internal/view/menu/ActionMenuPresenter.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
index df4243a4826f3..246c4dec1ff3a 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
@@ -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);