Merge "Fix bug 2911529"

2010-08-11 18:24:47 -07:00
parent aa17f00405 3d3da27ab3
commit 0df8bfed3c
1 changed files with 3 additions and 1 deletions
--- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java
+++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java
@ -92,7 +92,9 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
    }

    public void dismiss() {
-        mPopup.dismiss();
+        if (isShowing()) {
+            mPopup.dismiss();
+        }
        mPopup = null;
    }