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

Merge "Fix failure in ExifInterface on certain HEIF files" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-10 22:03:41 +00:00
committed by Android (Google) Code Review
parent abb815fbb0 64eeef77ee
commit a3a74591b7
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2540,19 +2540,20 @@ public class ExifInterface {
if (position < 0) {
return -1;
}
if (mPosition != position) {
in.seek(position);
mPosition = position;
}
try {
if (mPosition != position) {
in.seek(position);
mPosition = position;
}
int bytesRead = in.read(buffer, offset, size);
if (bytesRead < 0) {
mPosition = -1; // need to seek on next read
return -1;
}
mPosition += bytesRead;
return bytesRead;
int bytesRead = in.read(buffer, offset, size);
if (bytesRead >= 0) {
mPosition += bytesRead;
return bytesRead;
}
} catch (IOException e) {}
mPosition = -1; // need to seek on next read
return -1;
}
@Override