Commit 2fb3b394 authored May 12, 2010 by Grace Kloba Committed by Android Git Automerger May 12, 2010

am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the...

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.

Merge commit 'bfc63c7b' into kraken

* commit 'bfc63c7b':
  The default AlertDialog allows cancel. But the default

parents 1f35de2a bfc63c7b

core/java/android/webkit/CallbackProxy.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -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