diff options
| author | Patrick Scott <phanna@android.com> | 2010-03-30 11:41:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-30 11:41:29 -0700 |
| commit | ae405d56215e4ab43e8210b66e741a0bf9d5edcf (patch) | |
| tree | dc4c2e901fe2e451b96223be1ca95e20cbeab638 | |
| parent | 2a5d9f9b577376768372837723f0f42098aba13b (diff) | |
| parent | 0cf6046b8d0fcc920e253a2baca8d2a737c1620a (diff) | |
| download | frameworks_base-ae405d56215e4ab43e8210b66e741a0bf9d5edcf.zip frameworks_base-ae405d56215e4ab43e8210b66e741a0bf9d5edcf.tar.gz frameworks_base-ae405d56215e4ab43e8210b66e741a0bf9d5edcf.tar.bz2 | |
Merge "Fix a simple logic mistake." into froyo
| -rw-r--r-- | core/java/android/webkit/CallbackProxy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index 92ce4f0..188ab2a 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -1164,7 +1164,7 @@ class CallbackProxy extends Handler { // for null. WebHistoryItem i = mBackForwardList.getCurrentItem(); if (i != null) { - if (precomposed || i.getTouchIconUrl() != null) { + if (precomposed || i.getTouchIconUrl() == null) { i.setTouchIconUrl(url); } } |