summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jin Seok Park <jinpark@google.com> 2017-08-04 00:43:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-04 00:43:02 +0000
commit48dad606c5ecfaa7bdd1c3c36c12a7b9418e6a5b (patch)
tree0239a0780369f598d8a7c99d7656ccc59aafc7e7
parent1d66ccde369d7b12111d1bdb51782bf4ec944c44 (diff)
parentd113478931576931ef374f55410752f502cacd3b (diff)
Merge "ExifInterface: Remove throwing exception" into oc-mr1-dev
-rw-r--r--media/java/android/media/ExifInterface.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 6677178514e0..59597af55085 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -2101,9 +2101,7 @@ public class ExifInterface {
private int getMimeType(BufferedInputStream in) throws IOException {
in.mark(SIGNATURE_CHECK_SIZE);
byte[] signatureCheckBytes = new byte[SIGNATURE_CHECK_SIZE];
- if (in.read(signatureCheckBytes) != SIGNATURE_CHECK_SIZE) {
- throw new EOFException();
- }
+ in.read(signatureCheckBytes);
in.reset();
if (isJpegFormat(signatureCheckBytes)) {
return IMAGE_TYPE_JPEG;