Merge "Fix bug 3198503 - NPE at MenuPopupHelper.dismiss" (850a4c66) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -110,9 +110,11 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
	if (isShowing()) {		if (isShowing()) {
	mPopup.dismiss();		mPopup.dismiss();
	}		}
			if (mTreeObserver != null) {
	mTreeObserver.removeGlobalOnLayoutListener(this);		mTreeObserver.removeGlobalOnLayoutListener(this);
	mTreeObserver = null;		mTreeObserver = null;
	}		}
			}

	public boolean isShowing() {		public boolean isShowing() {
	return mPopup != null && mPopup.isShowing();		return mPopup != null && mPopup.isShowing();