From 0b2be42a07fcb66ca0a5f70624c8871245b4f6fd Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 23 Jun 2011 10:11:49 -0700
Subject: [PATCH] Fix bug 4595971 - Menu not prepared to be prepared

The menu key gets the menu ready on key down and shows it on key
up. Ensure on key up that we still have a valid menu before attempting
to show it.

Change-Id: I24e67fa0cdb14cb5471c087a5e9f55ec0b2edf9f
---
 policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index baa4ec3983541..7f6327dd88dd2 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -711,9 +711,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
                     mActionBar.isOverflowReserved()) {
                 if (mActionBar.getVisibility() == View.VISIBLE) {
                     if (!mActionBar.isOverflowMenuShowing()) {
-                        final Callback cb = getCallback();
-                        if (cb != null && !isDestroyed() &&
-                                cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) {
+                        if (!isDestroyed() && preparePanel(st, event)) {
                             playSoundEffect = mActionBar.showOverflowMenu();
                         }
                     } else {