am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo

Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken

* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
  Fix a simple logic mistake.
This commit is contained in:
Patrick Scott
2010-03-30 11:49:12 -07:00
committed by Android Git Automerger

View File

@@ -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);
}
}