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

Merge "ExifInterface: Remove throwing exception" into oc-mr1-dev

Browse Source
This commit is contained in:
Jin Seok Park
2017-08-04 00:43:02 +00:00
committed by Android (Google) Code Review
parent 1d66ccde36 d113478931
commit 48dad606c5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/ExifInterface.java
View File

@@ -2101,9 +2101,7 @@ public class ExifInterface {
private int getMimeType(BufferedInputStream in) throws IOException { private int getMimeType(BufferedInputStream in) throws IOException {
in.mark(SIGNATURE_CHECK_SIZE); in.mark(SIGNATURE_CHECK_SIZE);
byte[] signatureCheckBytes = new byte[SIGNATURE_CHECK_SIZE]; byte[] signatureCheckBytes = new byte[SIGNATURE_CHECK_SIZE];
if (in.read(signatureCheckBytes) != SIGNATURE_CHECK_SIZE) { in.read(signatureCheckBytes);
throw new EOFException();
}
in.reset(); in.reset();
if (isJpegFormat(signatureCheckBytes)) { if (isJpegFormat(signatureCheckBytes)) {
return IMAGE_TYPE_JPEG; return IMAGE_TYPE_JPEG;