From dfceaf2cdbc9355b10fd9c17777808fb65e61851 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Wed, 18 Apr 2012 08:37:41 -0700
Subject: [PATCH] Prevent dialog from invalid context

  Bug: 6346748

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

diff --git a/core/java/android/webkit/WebCoreThreadWatchdog.java b/core/java/android/webkit/WebCoreThreadWatchdog.java
index 0541d5db41570..655db310f6de1 100644
--- a/core/java/android/webkit/WebCoreThreadWatchdog.java
+++ b/core/java/android/webkit/WebCoreThreadWatchdog.java
@@ -16,6 +16,7 @@
 
 package android.webkit;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -146,6 +147,7 @@ class WebCoreThreadWatchdog implements Runnable {
                         break;
 
                     case TIMED_OUT:
+                        if ((mContext == null) || !(mContext instanceof Activity)) return;
                         new AlertDialog.Builder(mContext)
                             .setMessage(com.android.internal.R.string.webpage_unresponsive)
                             .setPositiveButton(com.android.internal.R.string.force_close,