From 0cf6046b8d0fcc920e253a2baca8d2a737c1620a Mon Sep 17 00:00:00 2001
From: Patrick Scott <phanna@android.com>
Date: Tue, 30 Mar 2010 13:59:09 -0400
Subject: [PATCH] Fix a simple logic mistake.

If the icon is precomposed or the icon IS null, set the touch icon url. This
ensures there will be a touch icon set if either precomposed or regular is
specified. Precomposed icons take precedence.

Bug: 2546984
Change-Id: Id9291006ecda8659b823ab9629eb98a6f8d45f5e
---
 core/java/android/webkit/CallbackProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index 92ce4f037a06c..188ab2ac5f8b1 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);
             }
         }