mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-23 18:26:15 +00:00
Bug 911604 - Add null check to SearchEnginePreference to prevent NPEs when corrupt Favicons encountered. r=mleibovic
This commit is contained in:
parent
d613892237
commit
105c08e9c6
@ -105,6 +105,10 @@ public class SearchEnginePreference extends Preference {
|
|||||||
// Create a drawable from the iconURI and assign it to this Preference for display.
|
// Create a drawable from the iconURI and assign it to this Preference for display.
|
||||||
String iconURI = geckoEngineJSON.getString("iconURI");
|
String iconURI = geckoEngineJSON.getString("iconURI");
|
||||||
Bitmap iconBitmap = BitmapUtils.getBitmapFromDataURI(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);
|
Bitmap scaledIconBitmap = Bitmap.createScaledBitmap(iconBitmap, sIconSize, sIconSize, false);
|
||||||
BitmapDrawable drawable = new BitmapDrawable(scaledIconBitmap);
|
BitmapDrawable drawable = new BitmapDrawable(scaledIconBitmap);
|
||||||
setIcon(drawable);
|
setIcon(drawable);
|
||||||
|
Loading…
Reference in New Issue
Block a user