am 2fb3b394: am bfc63c7b: am 336d7dcb: 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.

2010-05-12 15:37:22 -07:00
parent 35b1184339 2fb3b394fb
commit d4ef297311
1 changed files with 7 additions and 0 deletions
--- 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