Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Throw IOE from within resolveImage rather than NPE." into rvc-dev am: 36060929b4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12036439

Change-Id: I01089fe6006c94208191efec9833ea8d42d39769
This commit is contained in:
TreeHugger Robot
2020-06-29 21:36:18 +00:00
committed by Automerger Merge Worker
parent 3a48d58f51 36060929b4
commit e9efb2105c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolver.java
View File

@@ -124,6 +124,9 @@ public class NotificationInlineImageResolver implements ImageResolver {
*/ */
Drawable resolveImage(Uri uri) throws IOException { Drawable resolveImage(Uri uri) throws IOException {
BitmapDrawable image = resolveImageInternal(uri); BitmapDrawable image = resolveImageInternal(uri);
if (image == null || image.getBitmap() == null) {
throw new IOException("resolveImageInternal returned null for uri: " + uri);
}
Bitmap bitmap = image.getBitmap(); Bitmap bitmap = image.getBitmap();
image.setBitmap(Icon.scaleDownIfNecessary(bitmap, mMaxImageWidth, mMaxImageHeight)); image.setBitmap(Icon.scaleDownIfNecessary(bitmap, mMaxImageWidth, mMaxImageHeight));
return image; return image;