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

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

Merge "Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus"

parents c2d256b4 70e9f4bd

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

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