Merge "Fix .equals call in ImageDecoder" into rvc-dev am: 33696c1cca

Change-Id: I6d02f7fe043af98a0407ad2e2aa109f15b1abfe4
2020-04-28 15:51:19 +00:00
parent 3f0ecdb836 33696c1cca
commit cd6d5575c5
1 changed files with 1 additions and 1 deletions
--- 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 {