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

Author: sganov

core/java/android/widget/PopupWindow.java

@@ -1248,6 +1248,8 @@ public int getMaxAvailableHeight(View anchor, int yOffset, boolean ignoreBottomD
      */
     public void dismiss() {
         if (isShowing() && mPopupView != null) {
+            mIsShowing = false;
+
             unregisterForScrollChanged();
 
             try {
@@ -1257,7 +1259,6 @@ public void dismiss() {
                     ((ViewGroup) mPopupView).removeView(mContentView);
                 }
                 mPopupView = null;
-                mIsShowing = false;
 
                 if (mOnDismissListener != null) {
                     mOnDismissListener.onDismiss();