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

Commit 43f99202 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 26896 into eclair 

* changes:
  ResultTransport needs a default value. If the thread is ununlocked by something else other than CallbackProxy's notify(), it can have a null value.
parents a183cb5e dbad320b

core/java/android/webkit/CallbackProxy.java

+5 −1
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ class CallbackProxy extends Handler { 
        // Private result object

        private E mResult;



        public ResultTransport(E defaultResult) {

            mResult = defaultResult;

        }



        public synchronized void setResult(E result) {

            mResult = result;

        }
@@ -819,7 +823,7 @@ class CallbackProxy extends Handler { 
    public boolean shouldOverrideUrlLoading(String url) {

        // We have a default behavior if no client exists so always send the

        // message.

        ResultTransport<Boolean> res = new ResultTransport<Boolean>();

        ResultTransport<Boolean> res = new ResultTransport<Boolean>(false);

        Message msg = obtainMessage(OVERRIDE_URL);

        msg.getData().putString("url", url);

        msg.obj = res;