commit b0c9cf5cfc62dc53b3ed8d5b8f7cc370a78ba808
author Leon Scroggins III <scroggo@google.com> Tue Nov 30 13:16:19 2021 -0500
committer Leon Scroggins III <scroggo@google.com> Thu Dec 09 11:25:58 2021 -0500
tree f52d84eca01739b2aed2ecaabf26e7e8f1834076
parent 21684a2576a3172dc80cbbb7b59dc6c52f55606c

Treat AHARDWAREBUFFER_FORMAT_R8_UNORM as kAlpha_8_SkAlphaType

I4846327b29736ee811672801a683deb287342a8e added
AHARDWAREBUFFER_FORMAT_R8_UNORM. Treat it as kAlpha_8_SkAlphaType, since
we'll be using it as an alpha mask.

Bug: 193170859
Test: TODO

Change-Id: I24bebaff63bb1e98ec8a8178797ec25d2f6bc89a

libs/hwui/utils/Color.cpp

diff --git a/libs/hwui/utils/Color.cpp b/libs/hwui/utils/Color.cpp
index 9f3be16..2293ace 100644
--- a/libs/hwui/utils/Color.cpp
+++ b/libs/hwui/utils/Color.cpp
@@ -57,6 +57,10 @@
             colorType = kRGBA_F16_SkColorType;
             alphaType = kPremul_SkAlphaType;
             break;
+        case AHARDWAREBUFFER_FORMAT_R8_UNORM:
+            colorType = kAlpha_8_SkColorType;
+            alphaType = kPremul_SkAlphaType;
+            break;
         default:
             ALOGV("Unsupported format: %d, return unknown by default", format);
             break;
@@ -90,6 +94,8 @@
             // Hardcoding the value from android::PixelFormat
             static constexpr uint64_t kRGBA4444 = 7;
             return kRGBA4444;
+        case kAlpha_8_SkColorType:
+              return AHARDWAREBUFFER_FORMAT_R8_UNORM;
         default:
             ALOGV("Unsupported colorType: %d, return RGBA_8888 by default", (int)colorType);
             return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;