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

Merge "Use a ExifInterface ctor with a file descriptor as a parameter" am: f715c61542

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2485757

Change-Id: I8c2482febe7e289f51a1f122e4148b8443e41a8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ray Essick
2023-03-20 23:33:41 +00:00
committed by Automerger Merge Worker
parent e5a747dd3d f715c61542
commit d514714e14
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/ThumbnailUtils.java
View File

@@ -49,6 +49,7 @@ import com.android.internal.util.ArrayUtils;
import libcore.io.IoUtils; import libcore.io.IoUtils;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@@ -255,7 +256,8 @@ public class ThumbnailUtils {
// get orientation // get orientation
if (MediaFile.isExifMimeType(mimeType)) { if (MediaFile.isExifMimeType(mimeType)) {
exif = new ExifInterface(file); try (FileInputStream is = new FileInputStream(file)) {
exif = new ExifInterface(is.getFD());
switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) { switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) {
case ExifInterface.ORIENTATION_ROTATE_90: case ExifInterface.ORIENTATION_ROTATE_90:
orientation = 90; orientation = 90;
@@ -268,6 +270,7 @@ public class ThumbnailUtils {
break; break;
} }
} }
}
if (mimeType.equals("image/heif") if (mimeType.equals("image/heif")
|| mimeType.equals("image/heif-sequence") || mimeType.equals("image/heif-sequence")