Fix bug where return value for thumbnail can be null.

  Bug: 19779596

Change-Id: I4ccf39b0e19956c6873868bc02be836b547fa1c5

diff --git a/src/com/android/camera/data/VideoItem.java b/src/com/android/camera/data/VideoItem.java
index 0d550dc..1a9d17c 100644 (file)
--- a/src/com/android/camera/data/VideoItem.java
+++ b/src/com/android/camera/data/VideoItem.java
@@ -217,7 +217,8 @@ public class VideoItem extends FilmstripItemBase<VideoItemData> {
 
     @Override
     public Optional<Bitmap> generateThumbnail(int boundingWidthPx, int boundingHeightPx) {
-        return Optional.of(FilmstripItemUtils.loadVideoThumbnail(getData().getFilePath()));
+        return Optional.fromNullable(FilmstripItemUtils.loadVideoThumbnail(
+                getData().getFilePath()));
     }
 
     @Override