Bug 701839 - Wrong favicon displayed when both default location and link exists (crash fix) CLOSED TREE
authorBrian Nicholson <bnicholson@mozilla.com>
Thu, 17 Nov 2011 14:34:11 -0800
changeset 83528 f034ceedf46e1cbc571c584d3dc93347c491b784
parent 83527 556bacb7c080579406083a28118796a4f3fada85
child 83529 b92c1975156dcf27617f7badc7dbfcc5a41f8fa5
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs701839
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 701839 - Wrong favicon displayed when both default location and link exists (crash fix) CLOSED TREE
embedding/android/Favicons.java
--- a/embedding/android/Favicons.java
+++ b/embedding/android/Favicons.java
@@ -262,17 +262,17 @@ public class Favicons {
                 int pos = 0;
                 int offset = 0;
                 while ((pos = contentStream.read(bytes, offset, length - offset)) > 0)
                     offset += pos;
                 if (length == offset) {
                     byteStream = new ByteArrayInputStream(bytes);
                     image = (BitmapDrawable) Drawable.createFromStream(byteStream, "src");
                 }
-            } catch (IOException e) {
+            } catch (Exception e) {
                 Log.d(LOGTAG, "Error downloading favicon: " + e);
             } finally {
                 if (urlConnection != null)
                     urlConnection.disconnect();
                 try {
                     if (contentStream != null)
                         contentStream.close();
                     if (byteStream != null)