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

Throw IOE from within resolveImage rather than NPE.

Browse Source 
The failure will get handled gracefully by the caller (in
this case, loadImage()).

Fixes: 159780182
Test: atest frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationInlineImageResolverTest.java
Change-Id: I7af94d4a85d3e3fddd435ebb1f6e16042529c31c
This commit is contained in:
Dan Sandler
2020-06-29 12:38:17 -04:00
parent 3c34454ae9
commit 633b198a5d
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 {
BitmapDrawable image = resolveImageInternal(uri);
if (image == null || image.getBitmap() == null) {
throw new IOException("resolveImageInternal returned null for uri: " + uri);
}
Bitmap bitmap = image.getBitmap();
image.setBitmap(Icon.scaleDownIfNecessary(bitmap, mMaxImageWidth, mMaxImageHeight));
return image;