Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8502ab91 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

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

* commit 'daceb30b':
  Cancel handler for JS unload handler prevents hang.
parents c171d515 daceb30b

core/java/android/webkit/CallbackProxy.java

+8 −0
Original line number Diff line number Diff line
@@ -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();