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

Commit 8457f0fe authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 4595971 - Menu not prepared to be prepared"

parents 0ff6d7ee 0b2be42a

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 {