Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b510192 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am d00e75e9: am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0 

* commit 'd00e75e9':
  PopupWindow dismiss() can get into a recursive loop.
parents 025e948d d00e75e9

core/java/android/widget/PopupWindow.java

+2 −1
Original line number Diff line number Diff line
@@ -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();