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.

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index 1ec769b62659..37efdb0248b8 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -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;