commit a01fd70cd27bf362e18f9ad1b03c0665c98f0cdf
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 01 01:14:51 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 01 01:14:51 2023 +0000
tree e2ad96b82fadbfef74b97812a19b0c2b0ae4e35f
parent 078ddc7bf7fb57974c889cd2d9597b94bd234650
parent e7be42e6b40cbc198ec602de02145e9fc4546241

Snap for 10422301 from e7be42e6b40cbc198ec602de02145e9fc4546241 to udc-d1-release

Change-Id: I145ce5ce15afcf1335c12718800f09b67ecca239

client_utils/android/BitmapRegionDecoder.cpp

diff --git a/client_utils/android/BitmapRegionDecoder.cpp b/client_utils/android/BitmapRegionDecoder.cpp
index 110dc0f..c5262b8 100644
--- a/client_utils/android/BitmapRegionDecoder.cpp
+++ b/client_utils/android/BitmapRegionDecoder.cpp
@@ -79,10 +79,6 @@
     }
     SkISize scaledSize = fCodec->getSampledSubsetDimensions(sampleSize, subset);
 
-    if (fCodec->getInfo().colorType() == kGray_8_SkColorType) {
-        dstColorType = kGray_8_SkColorType;
-    }
-
     // Create the image info for the decode
     SkAlphaType dstAlphaType = fCodec->computeOutputAlphaType(requireUnpremul);
     SkImageInfo decodeInfo =