am 678ed0c5: Bug 5275928 - Don\'t try to open an overflow menu under invalid circumstances. (aa7cbf90) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -300,6 +300,7 @@ public class ActionMenuPresenter extends BaseMenuPresenter
		public boolean hideOverflowMenu() {
		if (mPostedOpenRunnable != null && mMenuView != null) {
		((View) mMenuView).removeCallbacks(mPostedOpenRunnable);
		mPostedOpenRunnable = null;
		return true;
		}

		@@ -653,10 +654,11 @@ public class ActionMenuPresenter extends BaseMenuPresenter

		public void run() {
		mMenu.changeMenuMode();
		if (mPopup.tryShow()) {
		final View menuView = (View) mMenuView;
		if (menuView != null && menuView.getWindowToken() != null && mPopup.tryShow()) {
		mOverflowPopup = mPopup;
		mPostedOpenRunnable = null;
		}
		mPostedOpenRunnable = null;
		}
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,9 @@ public class ActionBarContextView extends AbsActionBarView implements AnimatorLi
		});

		final MenuBuilder menu = (MenuBuilder) mode.getMenu();
		if (mActionMenuPresenter != null) {
		mActionMenuPresenter.dismissPopupMenus();
		}
		mActionMenuPresenter = new ActionMenuPresenter(mContext);
		mActionMenuPresenter.setReserveOverflow(true);