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

Merge "Handle null assetFd like a FNF"

Browse Source
This commit is contained in:
Leon Scroggins
2020-01-07 17:34:59 +00:00
committed by Android (Google) Code Review
parent 1d63fa9ae0 e8da8b12c3
commit d534534a72
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,6 +277,10 @@ public final class ImageDecoder implements AutoCloseable {
assetFd = mResolver.openAssetFileDescriptor(mUri, "r");
}
} catch (FileNotFoundException e) {
// Handled below, along with the case where assetFd was set to null.
}
if (assetFd == null) {
// Some images cannot be opened as AssetFileDescriptors (e.g.
// bmp, ico). Open them as InputStreams.
InputStream is = mResolver.openInputStream(mUri);
@@ -286,9 +290,7 @@ 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);
}
}