Merge "Prevent crash when dismissing a PopupWindow that didn't have time to show up. Bug #2520981"

1 files changed, 12 insertions, 10 deletions

diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java
index cf2ed86..0378328 100644
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -1048,16 +1048,18 @@ public class PopupWindow {
         if (isShowing() && mPopupView != null) {
             unregisterForScrollChanged();
 
-            mWindowManager.removeView(mPopupView);
-
-            if (mPopupView != mContentView && mPopupView instanceof ViewGroup) {
-                ((ViewGroup) mPopupView).removeView(mContentView);
-            }
-            mPopupView = null;
-            mIsShowing = false;
-
-            if (mOnDismissListener != null) {
-                mOnDismissListener.onDismiss();
+            try {
+                mWindowManager.removeView(mPopupView);                
+            } finally {
+                if (mPopupView != mContentView && mPopupView instanceof ViewGroup) {
+                    ((ViewGroup) mPopupView).removeView(mContentView);
+                }
+                mPopupView = null;
+                mIsShowing = false;
+    
+                if (mOnDismissListener != null) {
+                    mOnDismissListener.onDismiss();
+                }
             }
         }
     }