From 1fa26cbfc883ef76a46234d104906a1a9a515fc5 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Mon, 3 Oct 2011 10:56:28 -0700
Subject: Fix monkey NullPointerException

 bug: 5385775
 Check mWebViewCore has been destroyed
 Remove mWebTextView from WebView when WebView is destroyed
 Clear WebTextView's handler when it is removed from WebView

Change-Id: I9c62292d693109e692c341e3e4dba3e04af81fe4
---
 core/java/android/webkit/WebTextView.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/java/android/webkit/WebTextView.java')

diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 217ad7c4367e..18eb1edddd7c 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -768,9 +768,13 @@ import junit.framework.Assert;
             imm.hideSoftInputFromWindow(getWindowToken(), 0);
         }
         mInsideRemove = true;
+        boolean isFocused = hasFocus();
         mWebView.removeView(this);
-        mWebView.requestFocus();
+        if (isFocused) {
+            mWebView.requestFocus();
+        }
         mInsideRemove = false;
+        mHandler.removeCallbacksAndMessages(null);
     }
 
     @Override
-- 
cgit v1.2.3