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

Merge "Fix ExifInterface for .heic when meta is at the end" am: 98c9cd7b20

Browse Source 
am: 17fc70b1ee

Change-Id: Ib3073cfac59888d707583efd9a9fda1d3731f103
This commit is contained in:
Chong Zhang
2018-12-03 19:24:28 -08:00
committed by android-build-merger
parent 8dd21cd6b5 17fc70b1ee
commit 79fa7d39c3
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2545,13 +2545,18 @@ public class ExifInterface {
if (size == 0) {
return 0;
}
// We don't allow read positions after the available bytes,
// the input stream won't be able to seek back then.
if (position < 0 || position >= in.available()) {
if (position < 0) {
return -1;
}
try {
if (mPosition != position) {
// We don't allow seek to positions after the available bytes,
// the input stream won't be able to seek back then.
// However, if we hit an exception before (mPosition set to -1),
// let it try the seek in hope it might recover.
if (mPosition >= 0 && position >= mPosition + in.available()) {
return -1;
}
in.seek(position);
mPosition = position;
}
@@ -2559,8 +2564,8 @@ public class ExifInterface {
// If the read will cause us to go over the available bytes,
// reduce the size so that we stay in the available range.
// Otherwise the input stream may not be able to seek back.
if (mPosition + size > in.available()) {
size = in.available() - (int)mPosition;
if (size > in.available()) {
size = in.available();
}
int bytesRead = in.read(buffer, offset, size);