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

Merge "Missing thumbnails should throw." into qt-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2019-05-14 19:30:48 +00:00
committed by Android (Google) Code Review
parent d20761b1ee 4cf4a8b0ec
commit b26d003713
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/java/android/media/ThumbnailUtils.java
View File

@@ -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);