diff options
| author | Leon Scroggins <scroggo@google.com> | 2020-09-16 16:06:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-16 16:06:45 +0000 |
| commit | 3a62413c4f2d3c7c216856d7d1d4ef232fa4a451 (patch) | |
| tree | 3a26db4389f8f1bedecf8bb2e872b8a0ad9493b3 /graphics | |
| parent | a3144f871b719e2ed79b654cd1cdf4e741fa5aee (diff) | |
| parent | efca2d56f1c2a1a0271cc9a9ea42634705ceeebd (diff) | |
Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968
Change-Id: I9fe8e278e8efb2fe00206dd413b08e6cffc8291c
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/ImageDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java index c8f065ad094c..71744eff8a56 100644 --- a/graphics/java/android/graphics/ImageDecoder.java +++ b/graphics/java/android/graphics/ImageDecoder.java @@ -308,7 +308,7 @@ public final class ImageDecoder implements AutoCloseable { ImageDecoder decoder = null; try { - decoder = nCreate(fd, preferAnimation, source); + decoder = nCreate(fd, AssetFileDescriptor.UNKNOWN_LENGTH, preferAnimation, source); } finally { if (decoder == null) { IoUtils.closeQuietly(stream); @@ -356,7 +356,7 @@ public final class ImageDecoder implements AutoCloseable { try { try { Os.lseek(fd, offset, SEEK_SET); - decoder = nCreate(fd, preferAnimation, source); + decoder = nCreate(fd, assetFd.getDeclaredLength(), preferAnimation, source); } catch (ErrnoException e) { decoder = createFromStream(new FileInputStream(fd), true, preferAnimation, source); } @@ -1995,7 +1995,7 @@ public final class ImageDecoder implements AutoCloseable { private static native ImageDecoder nCreate(InputStream is, byte[] storage, boolean preferAnimation, Source src) throws IOException; // The fd must be seekable. - private static native ImageDecoder nCreate(FileDescriptor fd, + private static native ImageDecoder nCreate(FileDescriptor fd, long length, boolean preferAnimation, Source src) throws IOException; @NonNull private static native Bitmap nDecodeBitmap(long nativePtr, |