Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 26896 into eclair

Browse Source 
* 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.
This commit is contained in:
Android (Google) Code Review
2009-09-24 15:35:22 -04:00
parent a183cb5ebd dbad320bf3
commit 43f9920271
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/CallbackProxy.java
View File

@@ -116,6 +116,10 @@ class CallbackProxy extends Handler {
// Private result object // Private result object
private E mResult; private E mResult;
public ResultTransport(E defaultResult) {
mResult = defaultResult;
}
public synchronized void setResult(E result) { public synchronized void setResult(E result) {
mResult = result; mResult = result;
} }
@@ -819,7 +823,7 @@ class CallbackProxy extends Handler {
public boolean shouldOverrideUrlLoading(String url) { public boolean shouldOverrideUrlLoading(String url) {
// We have a default behavior if no client exists so always send the // We have a default behavior if no client exists so always send the
// message. // message.
ResultTransport<Boolean> res = new ResultTransport<Boolean>(); ResultTransport<Boolean> res = new ResultTransport<Boolean>(false);
Message msg = obtainMessage(OVERRIDE_URL); Message msg = obtainMessage(OVERRIDE_URL);
msg.getData().putString("url", url); msg.getData().putString("url", url);
msg.obj = res; msg.obj = res;