Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7b8bec280f20e8a5863d8214bbc195497335eba6':
  PopupWindow dismiss() can get into a recursive loop.
This commit is contained in:
Svetoslav Ganov
2011-11-11 08:02:27 +00:00
committed by Android Git Automerger
parent ab51626f22 7b8bec280f
commit d00e75e94d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/PopupWindow.java
View File

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