diff options
| author | Michael Kolb <kolby@google.com> | 2012-04-18 10:40:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 10:40:59 -0700 |
| commit | 23a2ce1fad31fc8467f3f53d39428e2d1f0a000e (patch) | |
| tree | 99f1c7bcabd3530b6030bbbf7f46431a1bece5aa /core/java/android | |
| parent | 3cdfcdc1c4802ecc2f0eb6beb6f7bdb714a85d2d (diff) | |
| parent | dfceaf2cdbc9355b10fd9c17777808fb65e61851 (diff) | |
| download | frameworks_base-23a2ce1fad31fc8467f3f53d39428e2d1f0a000e.zip frameworks_base-23a2ce1fad31fc8467f3f53d39428e2d1f0a000e.tar.gz frameworks_base-23a2ce1fad31fc8467f3f53d39428e2d1f0a000e.tar.bz2 | |
Merge "Prevent dialog from invalid context"
Diffstat (limited to 'core/java/android')
| -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, |