From 1612fab07b36959fe02fa13616f08413abf598ae Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 27 Aug 2012 16:44:39 -0700
Subject: [PATCH] Protect against focus changes after .destroy()

 Bug: 7026042

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

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 9df485282f42c..86e7f9b078bb8 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -6981,6 +6981,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
 
     @Override
     public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
+        // Check if we are destroyed
+        if (mWebViewCore == null) return false;
         // FIXME: If a subwindow is showing find, and the user touches the
         // background window, it can steal focus.
         if (mFindIsUp) return false;