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

Merge "ImageDecoder: throw FileNotFoundException on null"

Browse Source
This commit is contained in:
Leon Scroggins
2019-10-10 13:28:09 +00:00
committed by Android (Google) Code Review
parent aba57d6a0a 3d7ae4efff
commit a3b702fa84
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/graphics/ImageDecoder.java
View File

@@ -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();