diff options
| author | 2023-06-20 20:47:20 +0000 | |
|---|---|---|
| committer | 2023-06-20 20:47:20 +0000 | |
| commit | fe5b989baa7a892c027430434e065c53ee0d1e95 (patch) | |
| tree | 845e622258600fce34d58c38dc0027f6b569fc1b | |
| parent | 1160317c154734d82b860c8187d5820a23a996f9 (diff) | |
| parent | 95f31c6d24f39b1e96d80c55c5bd90496043c1bc (diff) | |
Revert "Use a ExifInterface ctor with a file descriptor as a parameter" am: d065a828da am: 95f31c6d24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23738336
Change-Id: I780c1c09e2e95a1c21c9c56c87e7c4c81665e29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/java/android/media/ThumbnailUtils.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/media/java/android/media/ThumbnailUtils.java b/media/java/android/media/ThumbnailUtils.java index 6744359d12d7..9b238e172247 100644 --- a/media/java/android/media/ThumbnailUtils.java +++ b/media/java/android/media/ThumbnailUtils.java @@ -49,7 +49,6 @@ import com.android.internal.util.ArrayUtils; import libcore.io.IoUtils; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.util.Arrays; import java.util.Comparator; @@ -256,19 +255,17 @@ public class ThumbnailUtils { // get orientation if (MediaFile.isExifMimeType(mimeType)) { - try (FileInputStream is = new FileInputStream(file)) { - exif = new ExifInterface(is.getFD()); - switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) { - case ExifInterface.ORIENTATION_ROTATE_90: - orientation = 90; - break; - case ExifInterface.ORIENTATION_ROTATE_180: - orientation = 180; - break; - case ExifInterface.ORIENTATION_ROTATE_270: - orientation = 270; - break; - } + exif = new ExifInterface(file); + switch (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0)) { + case ExifInterface.ORIENTATION_ROTATE_90: + orientation = 90; + break; + case ExifInterface.ORIENTATION_ROTATE_180: + orientation = 180; + break; + case ExifInterface.ORIENTATION_ROTATE_270: + orientation = 270; + break; } } |