diff options
| author | Ray Chen <raychen@google.com> | 2009-10-09 09:28:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-09 09:28:44 -0700 |
| commit | 7c86fc066a010ed50877ee3066d542f873d762c2 (patch) | |
| tree | 5926888966f37d1fd5dd047f4af89a1eb4a7f47b /media/java | |
| parent | 861c462c521db2ca54924c3e6a8563784db98b53 (diff) | |
| parent | 23a2d92f2dd122a6f7ba39580b1d7be088ce6de0 (diff) | |
| download | frameworks_base-7c86fc066a010ed50877ee3066d542f873d762c2.zip frameworks_base-7c86fc066a010ed50877ee3066d542f873d762c2.tar.gz frameworks_base-7c86fc066a010ed50877ee3066d542f873d762c2.tar.bz2 | |
am 23a2d92f: Merge change Ib01005ea into eclair-mr2
Merge commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0' into eclair-mr2-plus-aosp
* commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0':
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(); |