commit 79201e57c9a07c7168b6e56938d7bed3f9310c0e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:33 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 30 05:30:33 2021 +0000
tree a17ecb55759d29a01c856d6d9e568e3715fc9b5d
parent e55724765970cd22e74b8cfed61307c01c350e8d
parent fa5458660a98d71046a8325100b8083b9a05d293

Merge cherrypicks of [15151697, 15151718, 15151899, 15151900, 15151901, 15151902, 15151904, 15151906, 15151930, 15151932, 15151933, 15151856, 15151858, 15151388, 15151971, 15151972, 15151973] into security-aosp-qt-release

Change-Id: Ie09e1ffde3fc72c1461d3e7fd6af6aa81f2bb1da

src/codec/SkPngCodec.cpp

diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index ed549b7..24be705 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -934,22 +934,39 @@
             }
         }
 
-        if (encodedColorType == PNG_COLOR_TYPE_GRAY_ALPHA) {
-            png_color_8p sigBits;
-            if (png_get_sBIT(fPng_ptr, fInfo_ptr, &sigBits)) {
-                if (8 == sigBits->alpha && kGraySigBit_GrayAlphaIsJustAlpha == sigBits->gray) {
-                    color = SkEncodedInfo::kXAlpha_Color;
+        switch (encodedColorType) {
+            case PNG_COLOR_TYPE_GRAY_ALPHA:{
+                png_color_8p sigBits;
+                if (png_get_sBIT(fPng_ptr, fInfo_ptr, &sigBits)) {
+                    if (8 == sigBits->alpha && kGraySigBit_GrayAlphaIsJustAlpha == sigBits->gray) {
+                        color = SkEncodedInfo::kXAlpha_Color;
+                    }
                 }
+                break;
             }
-        } else if (SkEncodedInfo::kOpaque_Alpha == alpha) {
+            case 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) {
+                        // Recommend a decode to 565 if the sBIT indicates 565.
+                        color = SkEncodedInfo::k565_Color;
+                    }
+                }
+                break;
+            }
+        }
+
+#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) {
-                    // Recommend a decode to 565 if the sBIT indicates 565.
-                    color = SkEncodedInfo::k565_Color;
+                    SkAndroidFrameworkUtils::SafetyNetLog("190188264");
                 }
             }
         }
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
 
         SkEncodedInfo encodedInfo = SkEncodedInfo::Make(origWidth, origHeight, color, alpha,
                                                         bitDepth, std::move(profile));