Merge "Prevent dialog from invalid context"

2012-04-18 10:40:59 -07:00
parent 3cdfcdc1c4 dfceaf2cdb
commit 23a2ce1fad
1 changed files with 2 additions and 0 deletions
--- 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,