From cfffd6ded33a6746eb66695abea6a510650926db Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Wed, 26 Oct 2011 10:50:35 -0700
Subject: [PATCH] Bug 696550: Favicon should be reset in the Tab, when there is
 a location change [r=mfinkle]

---
 embedding/android/GeckoApp.java | 3 ++-
 embedding/android/Tab.java      | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index ed72a81cef35..98c22317ab63 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -540,7 +540,7 @@ abstract public class GeckoApp
     }
 
     void handleLocationChange(final int tabId, final String uri) {
-        Tab tab = Tabs.getInstance().getTab(tabId);
+        final Tab tab = Tabs.getInstance().getTab(tabId);
         if (tab == null)
             return;
         
@@ -564,6 +564,7 @@ abstract public class GeckoApp
             public void run() {
                 mBrowserToolbar.setTitle(uri);
                 mBrowserToolbar.setFavicon(null);
+                tab.updateFavicon(null);
             }
         });
     }
diff --git a/embedding/android/Tab.java b/embedding/android/Tab.java
index 118474bb5325..1f12a122e75b 100644
--- a/embedding/android/Tab.java
+++ b/embedding/android/Tab.java
@@ -139,10 +139,8 @@ public class Tab {
     }
 
     public void updateFavicon(Drawable favicon) {
-        if (favicon != null) {
-            this.favicon = favicon;
-            Log.i(LOG_FILE_NAME, "Updated favicon for tab with id: " + this.id);
-        }
+        this.favicon = favicon;
+        Log.i(LOG_FILE_NAME, "Updated favicon for tab with id: " + this.id);
     }
 
     public boolean doReload() {