commit bf28cef2e1d8d9ce9d9cd0f94a0d29c506f9a4f8
author Adam Powell <adamp@google.com> Mon Aug 22 17:06:41 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 22 17:06:41 2011 -0700
tree dab501a7e057810525902da1bb10f8ae40ee5e57
parent f51ff04f1963adc4702c0c14793315dabb2a5300
parent 0ddc899dc5f2acebb1daa19369dbfe81d257690d

am 0ddc899d: Merge "Fix bug 5189070 - Don\'t try to show overflow popups for nonexistant menus"

* commit '0ddc899dc5f2acebb1daa19369dbfe81d257690d':
  Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus

core/java/com/android/internal/view/menu/ActionMenuPresenter.java

diff --git a/core/java/com/android/internal/view/menu/ActionMenuPresenter.java b/core/java/com/android/internal/view/menu/ActionMenuPresenter.java
index df4243a..246c4de 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 @@
      * @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);