Merge "Verify attached before showing a dialog" into jb-dev

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 1bab91f99b11..dcc99d849259 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -8242,6 +8242,12 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
 
         @Override
         public void run() {
+            if (mWebViewCore == null
+                    || getWebView().getWindowToken() == null
+                    || getWebView().getViewRootImpl() == null) {
+                // We've been detached and/or destroyed since this was posted
+                return;
+            }
             final ListView listView = (ListView) LayoutInflater.from(mContext)
                     .inflate(com.android.internal.R.layout.select_dialog, null);
             final MyArrayListAdapter adapter = new MyArrayListAdapter();