diff options
| author | Grace Kloba <klobag@google.com> | 2010-05-12 14:28:07 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-05-12 14:28:07 -0700 |
| commit | 336d7dcb105a43ee4de51fd0f26f277c63662f02 (patch) | |
| tree | 217b8d67ba591d810d2eb55a9cc7ce187d877f0d /core/java | |
| parent | a04202b3258845688bcd8c6208222235569df733 (diff) | |
| download | frameworks_base-336d7dcb105a43ee4de51fd0f26f277c63662f02.zip frameworks_base-336d7dcb105a43ee4de51fd0f26f277c63662f02.tar.gz frameworks_base-336d7dcb105a43ee4de51fd0f26f277c63662f02.tar.bz2 | |
The default AlertDialog allows cancel. But the default
JSConfim doesn't have a cancel listener. So when
user cancel the dialog, we do not wake up the WebCoreThread.
The same code is already done for JSPrompt dialog correctly.
Fix http://b/issue?id=2679139
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/CallbackProxy.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index 8af2492..0e0e032 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -542,6 +542,13 @@ class CallbackProxy extends Handler { int which) { res.cancel(); }}) + .setOnCancelListener( + new DialogInterface.OnCancelListener() { + public void onCancel( + DialogInterface dialog) { + res.cancel(); + } + }) .show(); } // Tell the JsResult that it is ready for client |