diff options
| author | Ray Chen <raychen@google.com> | 2009-10-08 14:50:47 -0700 |
|---|---|---|
| committer | Ray Chen <raychen@google.com> | 2009-10-08 14:53:13 -0700 |
| commit | b01005ea21be2aedd0871fb4d41301dd09ef428a (patch) | |
| tree | 3679433b6ddb8d4558e1e708be01e00b0d3e609d /media/java | |
| parent | 2d295a9601315a2610a2cb759ed9a4f787e7d4b5 (diff) | |
| download | frameworks_base-b01005ea21be2aedd0871fb4d41301dd09ef428a.zip frameworks_base-b01005ea21be2aedd0871fb4d41301dd09ef428a.tar.gz frameworks_base-b01005ea21be2aedd0871fb4d41301dd09ef428a.tar.bz2 | |
Avoid extracting EXIF data for non-JPEG images.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/ThumbnailUtil.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/java/android/media/ThumbnailUtil.java b/media/java/android/media/ThumbnailUtil.java index f9d69fb..8acb744 100644 --- a/media/java/android/media/ThumbnailUtil.java +++ b/media/java/android/media/ThumbnailUtil.java @@ -33,6 +33,7 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Rect; import android.media.MediaMetadataRetriever; +import android.media.MediaFile.MediaFileType; import java.io.ByteArrayOutputStream; import java.io.FileDescriptor; @@ -305,8 +306,12 @@ public class ThumbnailUtil { ThumbnailUtil.THUMBNAIL_TARGET_SIZE : ThumbnailUtil.MINI_THUMB_TARGET_SIZE; int maxPixels = wantMini ? ThumbnailUtil.THUMBNAIL_MAX_NUM_PIXELS : ThumbnailUtil.MINI_THUMB_MAX_NUM_PIXELS; - byte[] thumbData = createThumbnailFromEXIF(filePath, targetSize); + byte[] thumbData = null; Bitmap bitmap = null; + MediaFileType fileType = MediaFile.getFileType(filePath); + if (fileType != null && fileType.fileType == MediaFile.FILE_TYPE_JPEG) { + thumbData = createThumbnailFromEXIF(filePath, targetSize); + } if (thumbData != null) { BitmapFactory.Options options = new BitmapFactory.Options(); |