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

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

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

Change-Id: Ic87e95a452b6d499dda9042758bb0a48163ba3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ray Essick
2023-06-19 16:35:33 +00:00
committed by Automerger Merge Worker
parent 2cb4db028b af1f86b334
commit cf76673ad2
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,6 @@ 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;
@@ -256,8 +255,7 @@ public class ThumbnailUtils {
// get orientation // get orientation
if (MediaFile.isExifMimeType(mimeType)) { if (MediaFile.isExifMimeType(mimeType)) {
try (FileInputStream is = new FileInputStream(file)) { exif = new ExifInterface(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;
@@ -270,7 +268,6 @@ 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")