diff options
| -rw-r--r-- | graphics/java/android/graphics/drawable/Icon.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index f359025f4b46..ed152583f54c 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -494,15 +494,22 @@ public final class Icon implements Parcelable { case TYPE_URI: InputStream is = getUriInputStream(context); if (is != null) { - return new BitmapDrawable(context.getResources(), - fixMaxBitmapSize(BitmapFactory.decodeStream(is))); + final Bitmap bitmap = BitmapFactory.decodeStream(is); + if (bitmap == null) { + Log.w(TAG, "Unable to decode image from URI: " + getUriString()); + } + return new BitmapDrawable(context.getResources(), fixMaxBitmapSize(bitmap)); } break; case TYPE_URI_ADAPTIVE_BITMAP: is = getUriInputStream(context); if (is != null) { + final Bitmap bitmap = BitmapFactory.decodeStream(is); + if (bitmap == null) { + Log.w(TAG, "Unable to decode image from URI: " + getUriString()); + } return new AdaptiveIconDrawable(null, new BitmapDrawable(context.getResources(), - fixMaxBitmapSize(BitmapFactory.decodeStream(is)))); + fixMaxBitmapSize(bitmap))); } break; } |