Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0

2011-11-11 00:00:02 -08:00
parent 30f03ac650 06f938e8aa
commit 7b8bec280f
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1248,6 +1248,8 @@ public class PopupWindow {
     */
    public void dismiss() {
        if (isShowing() && mPopupView != null) {
+            mIsShowing = false;
+
            unregisterForScrollChanged();

            try {
@@ -1257,7 +1259,6 @@ public class PopupWindow {
                    ((ViewGroup) mPopupView).removeView(mContentView);
                }
                mPopupView = null;
-                mIsShowing = false;
    
                if (mOnDismissListener != null) {
                    mOnDismissListener.onDismiss();