From 4cf4a8b0ec41c04ec6607a7e92d0ef25b45df5e0 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 14 May 2019 11:25:47 -0600 Subject: [PATCH] Missing thumbnails should throw. Bug: 132248209 Test: atest --test-mapping packages/providers/MediaProvider Change-Id: Iac17eaa17c25041de13069f1e73a70006051ab8b --- media/java/android/media/ThumbnailUtils.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/ThumbnailUtils.java b/media/java/android/media/ThumbnailUtils.java index 5de56c718570..b3c2bb78862a 100644 --- a/media/java/android/media/ThumbnailUtils.java +++ b/media/java/android/media/ThumbnailUtils.java @@ -52,6 +52,7 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.Comparator; +import java.util.Objects; import java.util.function.ToIntFunction; /** @@ -369,10 +370,12 @@ public class ThumbnailUtils { // If we're okay with something larger than native format, just // return a frame without up-scaling it if (size.getWidth() > width && size.getHeight() > height) { - return mmr.getFrameAtTime(duration / 2, OPTION_CLOSEST_SYNC); + return Objects.requireNonNull( + mmr.getFrameAtTime(duration / 2, OPTION_CLOSEST_SYNC)); } else { - return mmr.getScaledFrameAtTime(duration / 2, OPTION_CLOSEST_SYNC, - size.getWidth(), size.getHeight()); + return Objects.requireNonNull( + mmr.getScaledFrameAtTime(duration / 2, OPTION_CLOSEST_SYNC, + size.getWidth(), size.getHeight())); } } catch (RuntimeException e) { throw new IOException("Failed to create thumbnail", e); -- 2.11.0