diff options
| author | Leon Scroggins <scroggo@google.com> | 2020-09-16 17:01:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-16 17:01:31 +0000 |
| commit | b9d7c9ec52df8991e10f6194f27989aeb24c7688 (patch) | |
| tree | 7cc4dcd52de92ed6833a8fc00edd412ab0367db8 /graphics | |
| parent | 71b958536e21205d23dc2e75a8da2b3de8f7bf09 (diff) | |
| parent | 3a62413c4f2d3c7c216856d7d1d4ef232fa4a451 (diff) | |
Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968
Change-Id: I85afba6ce0d53370031c089f30e2af69df02f8c9
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, |