From 33e8bb6ab0d1f7b82c396aaea8de3b64e9a66c6a Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Fri, 27 Jul 2012 09:52:57 -0700
Subject: [PATCH] Bug 777591 - Part 2: Fix Favicon deprecation warning.
 r=blassey

---
 mobile/android/base/Favicons.java       | 2 +-
 mobile/android/base/GeckoJarReader.java | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/Favicons.java b/mobile/android/base/Favicons.java
index 4a70f4fe6783..7afee477a0e4 100644
--- a/mobile/android/base/Favicons.java
+++ b/mobile/android/base/Favicons.java
@@ -269,7 +269,7 @@ public class Favicons {
                           " with favicon URL = " + mFaviconUrl);
 
             if (mFaviconUrl.startsWith("jar:jar:")) {
-                return GeckoJarReader.getBitmapDrawable(mFaviconUrl);
+                return GeckoJarReader.getBitmapDrawable(GeckoApp.mAppContext.getResources(), mFaviconUrl);
             }
 
             URI uri;
diff --git a/mobile/android/base/GeckoJarReader.java b/mobile/android/base/GeckoJarReader.java
index ad7017d79c2f..545e40ccbf5a 100644
--- a/mobile/android/base/GeckoJarReader.java
+++ b/mobile/android/base/GeckoJarReader.java
@@ -4,6 +4,7 @@
 
 package org.mozilla.gecko.util;
 
+import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 import android.util.Log;
 
@@ -25,7 +26,7 @@ public final class GeckoJarReader {
 
     private GeckoJarReader() {}
 
-    public static BitmapDrawable getBitmapDrawable(String url) {
+    public static BitmapDrawable getBitmapDrawable(Resources resources, String url) {
         Stack<String> jarUrls = parseUrl(url);
         InputStream inputStream = null;
         BitmapDrawable bitmap = null;
@@ -36,7 +37,7 @@ public final class GeckoJarReader {
             zip = getZipFile(jarUrls.pop());
             inputStream = getStream(zip, jarUrls);
             if (inputStream != null) {
-                bitmap = new BitmapDrawable(inputStream);
+                bitmap = new BitmapDrawable(resources, inputStream);
             }
         } catch (IOException ex) {
             Log.e(LOGTAG, "Exception ", ex);