From d4717b8b6f51e6a2395211de5f4d4cfd60b977ae Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 4 May 2012 13:13:38 -0700
Subject: [PATCH] Verify attached before showing a dialog

 Bug: 6372828

Change-Id: I7f3360ab8a0cdcaf20829e6e2c9181c7af73586e
---
 core/java/android/webkit/WebViewClassic.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 9936937e019ec..4d84d775e16bc 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -8243,6 +8243,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();