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

Merge change Ib01005ea into eclair-mr2

Browse Source 
* changes:
  Avoid extracting EXIF data for non-JPEG images.
This commit is contained in:
Android (Google) Code Review
2009-10-09 12:21:37 -04:00
parent 9b8f947790 b01005ea21
commit 23a2d92f2d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/ThumbnailUtil.java
View File

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