diff options
| author | Leon Scroggins III <scroggo@google.com> | 2020-04-27 15:31:21 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2020-04-28 14:14:30 +0000 |
| commit | 6419ebff5c553a87ff30f3e298b68519f82420e0 (patch) | |
| tree | 858a491da47b86dfe336ee428b1a1e0e6ebb4238 | |
| parent | 3b8aa159118bf83ef8a11834f2509e50d3c10fe3 (diff) | |
Fix .equals call in ImageDecoder
Bug: 154954875
Bug: 143231863
Test: I93b01cb60a8c76110ea2ff4250d0048512629d8d
I9229039b752bafa9a9b85b914a62093dff1eec34 switched from "==" to
".equals", but it did not take into account that Uri#getScheme() can
return null. Switch around the .equals check so that it is called on
SCHEME_CONTENT, which will never be null.
Change-Id: I0df5d2407a32fad0e21e597697af293fbc2fb315
Merged-In: I0df5d2407a32fad0e21e597697af293fbc2fb315
| -rw-r--r-- | graphics/java/android/graphics/ImageDecoder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java index 83432c362672..97b448aa8ff0 100644 --- a/graphics/java/android/graphics/ImageDecoder.java +++ b/graphics/java/android/graphics/ImageDecoder.java @@ -270,7 +270,7 @@ public final class ImageDecoder implements AutoCloseable { public ImageDecoder createImageDecoder(boolean preferAnimation) throws IOException { AssetFileDescriptor assetFd = null; try { - if (mUri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) { + if (ContentResolver.SCHEME_CONTENT.equals(mUri.getScheme())) { assetFd = mResolver.openTypedAssetFileDescriptor(mUri, "image/*", null); } else { |