diff options
| -rw-r--r-- | core/java/android/webkit/WebCoreThreadWatchdog.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebCoreThreadWatchdog.java b/core/java/android/webkit/WebCoreThreadWatchdog.java index 0541d5d..655db31 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, |