diff options
| -rw-r--r-- | graphics/java/android/graphics/ImageDecoder.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java index 150a941c061e..6619dba159c2 100644 --- a/graphics/java/android/graphics/ImageDecoder.java +++ b/graphics/java/android/graphics/ImageDecoder.java @@ -286,6 +286,9 @@ public final class ImageDecoder implements AutoCloseable { return createFromStream(is, true, preferAnimation, this); } + if (assetFd == null) { + throw new FileNotFoundException(mUri.toString()); + } return createFromAssetFileDescriptor(assetFd, preferAnimation, this); } } @@ -341,6 +344,9 @@ public final class ImageDecoder implements AutoCloseable { @NonNull private static ImageDecoder createFromAssetFileDescriptor(@NonNull AssetFileDescriptor assetFd, boolean preferAnimation, Source source) throws IOException { + if (assetFd == null) { + throw new FileNotFoundException(); + } final FileDescriptor fd = assetFd.getFileDescriptor(); final long offset = assetFd.getStartOffset(); |