From d48462522e3e3083be8d5f0c470e6cd31c5a2910 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Thu, 22 Mar 2012 17:24:30 -0700
Subject: [PATCH] Bug 709250 - Disable jar reader for now.

---
 mobile/android/base/Favicons.java | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/mobile/android/base/Favicons.java b/mobile/android/base/Favicons.java
index 770052ce6500..91bd2f8813d7 100644
--- a/mobile/android/base/Favicons.java
+++ b/mobile/android/base/Favicons.java
@@ -295,22 +295,7 @@ public class Favicons {
                     image = (BitmapDrawable) Drawable.createFromStream(byteStream, "src");
                 }
             } catch (Exception e) {
-                // Trying to read icons from nested jar files will fail
-                if (mFaviconUrl.startsWith("jar:jar:")) {
-                    try {
-                        InputStream stream = GeckoJarReader.getStream(mFaviconUrl);
-                        if (stream != null) {
-                            image = new BitmapDrawable(stream);
-                            stream.close();
-                        } else {
-                            Log.d(LOGTAG, "Error getting favicon from jar: " + e);
-                        }
-                    } catch(IOException ex) {
-                        Log.e(LOGTAG, "Error closing stream", ex);
-                    }
-                } else {
-                    Log.e(LOGTAG, "Error downloading favicon", e);
-                }
+                Log.e(LOGTAG, "Error downloading favicon", e);
             } finally {
                 if (urlConnection != null && urlConnection instanceof HttpURLConnection) {
                     HttpURLConnection httpConnection = (HttpURLConnection) urlConnection;