Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b2be42a authored by Adam Powell's avatar Adam Powell
Browse files

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
parent b59f6776

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+1 −3
Original line number Diff line number Diff line
@@ -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 {