commit 74d4843641ca1f810e27989873697cba1f41338a
author Ray Chen <raychen@google.com> Fri Mar 12 11:38:04 2010 -0800
committer Ray Chen <raychen@google.com> Mon Mar 15 10:45:35 2010 -0700
tree 622138e7132ebacb6ac8b72a6dcea70a1c78d6f4
parent 7d740861415523feb239d94d805fa985835663c0

Fix #2509370 ThumbnailUtils.createThumbnailFromEXIF crashes media provider.

Change-Id: Ia2cd00fb0fbdb32e9fb89b4d33ad3c1410eb40d3

media/java/android/media/ThumbnailUtils.java

diff --git a/media/java/android/media/ThumbnailUtils.java b/media/java/android/media/ThumbnailUtils.java
index 23f850a..5062e87 100644
--- a/media/java/android/media/ThumbnailUtils.java
+++ b/media/java/android/media/ThumbnailUtils.java
@@ -568,7 +568,7 @@
         fullThumbWidth = fullOptions.outWidth / fullOptions.inSampleSize;
 
         // Choose the larger thumbnail as the returning sizedThumbBitmap.
-        if (exifThumbWidth >= fullThumbWidth) {
+        if (thumbData != null && exifThumbWidth >= fullThumbWidth) {
             int width = exifOptions.outWidth;
             int height = exifOptions.outHeight;
             exifOptions.inJustDecodeBounds = false;