Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e47d6501 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

am: a3a74591

Change-Id: I4d9486065660aa1331a02adc3d79d2f78062bd68
parents 92697b5a a3a74591
Loading
Loading
Loading
Loading
+13 −12
Original line number Diff line number Diff line
@@ -2540,20 +2540,21 @@ public class ExifInterface {
                    if (position < 0) {
                        return -1;
                    }
                    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;
                    }

                        if (bytesRead >= 0) {
                            mPosition += bytesRead;
                            return bytesRead;
                        }
                    } catch (IOException e) {}
                    mPosition = -1; // need to seek on next read
                    return -1;
                }

                @Override
                public long getSize() throws IOException {