From 336d7dcb105a43ee4de51fd0f26f277c63662f02 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Wed, 12 May 2010 14:28:07 -0700
Subject: 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
---
core/java/android/webkit/CallbackProxy.java | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'core/java')
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
--
cgit v1.1