am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev

* commit 'daceb30bf5e54aeb73a3909a26f51322d3f8efdc': Cancel handler for JS unload handler prevents hang.
2012-08-02 16:31:05 -07:00
parent c171d515b3 daceb30bf5
commit 8502ab91bd
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -736,6 +736,14 @@ class CallbackProxy extends Handler {
                                                res.cancel();
                                            }
                                        })
+                                .setOnCancelListener(
+                                        new DialogInterface.OnCancelListener() {
+                                            @Override
+                                            public void onCancel(
+                                                    DialogInterface dialog) {
+                                                res.cancel();
+                                            }
+                                        })
                                .show();
                    }
                    receiver.setReady();