Fix bug 5183332 - monkeys are jerks (39744bf7) · Commits · e / os / android_frameworks_base

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

+9 −5

Original line number	Diff line number	Diff line
		@@ -386,8 +386,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		// Ditch the menu created above
		st.menu = null;

		if (mActionBar != null) {
		// Don't show it in the action bar either
		mActionBar.setMenu(null, mActionMenuPresenterCallback);
		}

		return false;
		}
		@@ -409,9 +411,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		if (!cb.onPreparePanel(st.featureId, st.createdPanelView, st.menu)) {
		if (mActionBar != null) {
		// The app didn't want to show the menu for now but it still exists.
		// Clear it out of the action bar.
		mActionBar.setMenu(null, mActionMenuPresenterCallback);
		}
		st.menu.startDispatchingItemsChanged();
		return false;
		}