commit 89582627bd8e432351b90a9561b73106c0d67833
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:14 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:14 2021 +0000
tree 0981ac6ae85bb142a8e20082cbcaa89ed48ee768
parent 8b86cd71c2664b2d13fc2f0acc5b6ec7eabc10d8
parent 0f20107d87d2724c014ef72a4505f82af96d7cb3

Merge cherrypicks of [15151696, 15151717, 15151893, 15151895, 15151897, 15151898, 15150909, 15151854, 15151855, 15151385, 15151702, 15151705, 15151707] into security-aosp-pi-release

Change-Id: I2a7b0f8b95ec8de222377a0bdef14a83dc77c69d

src/codec/SkPngCodec.cpp

diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index ebfe745..9646569 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -952,7 +952,7 @@
                     imageInfo = imageInfo.makeColorType(kAlpha_8_SkColorType);
                 }
             }
-        } else if (SkEncodedInfo::kOpaque_Alpha == alpha) {
+        } else if (encodedColorType == PNG_COLOR_TYPE_RGB) {
             png_color_8p sigBits;
             if (png_get_sBIT(fPng_ptr, fInfo_ptr, &sigBits)) {
                 if (5 == sigBits->red && 6 == sigBits->green && 5 == sigBits->blue) {
@@ -962,6 +962,18 @@
             }
         }
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+        if (encodedColorType != PNG_COLOR_TYPE_GRAY_ALPHA
+            && SkEncodedInfo::kOpaque_Alpha == alpha) {
+            png_color_8p sigBits;
+            if (png_get_sBIT(fPng_ptr, fInfo_ptr, &sigBits)) {
+                if (5 == sigBits->red && 6 == sigBits->green && 5 == sigBits->blue) {
+                    SkAndroidFrameworkUtils::SafetyNetLog("190188264");
+                }
+            }
+        }
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
+
         if (1 == numberPasses) {
             *fOutCodec = new SkPngNormalDecoder(encodedInfo, imageInfo,
                    std::unique_ptr<SkStream>(fStream), fChunkReader, fPng_ptr, fInfo_ptr, bitDepth);