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

This commit is contained in:
Patrick Scott
2010-03-30 11:55:25 -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);
}
}