Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 18:26:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 911604 - Add null check to SearchEnginePreference to prevent NPEs when corrupt Favicons encountered. r=mleibovic

Browse Source
This commit is contained in:
Chris Kitching 2013-09-04 12:51:28 -04:00
parent d613892237
commit 105c08e9c6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/preferences/SearchEnginePreference.java
View File

@ -105,6 +105,10 @@ public class SearchEnginePreference extends Preference {
// Create a drawable from the iconURI and assign it to this Preference for display.
String iconURI = geckoEngineJSON.getString("iconURI");
Bitmap iconBitmap = BitmapUtils.getBitmapFromDataURI(iconURI);
// The favicon provided may be null or corrupt, if there was a network error or similar.
if (iconBitmap == null) {
return;
}
Bitmap scaledIconBitmap = Bitmap.createScaledBitmap(iconBitmap, sIconSize, sIconSize, false);
BitmapDrawable drawable = new BitmapDrawable(scaledIconBitmap);
setIcon(drawable);