Merge "Use kN32_SkColorType when creating the buffer for SkiaHostPipeline" into android12-hostruntime-devandroid12-hostruntime-dev

1 files changed, 8 insertions, 10 deletions

diff --git a/libs/hwui/pipeline/skia/SkiaHostPipeline.cpp b/libs/hwui/pipeline/skia/SkiaHostPipeline.cpp
index 5faeb9dc503e..431487a65121 100644
--- a/libs/hwui/pipeline/skia/SkiaHostPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaHostPipeline.cpp
@@ -69,16 +69,14 @@ bool SkiaHostPipeline::setSurface(ANativeWindow* surface, SwapBehavior swapBehav
         int width, height;
         surface->query(surface, NATIVE_WINDOW_WIDTH, &width);
         surface->query(surface, NATIVE_WINDOW_HEIGHT, &height);
-        // The image must have color type BGRA for all platforms.
-        // Robolectric note:
-        // This forces Skia to render ARGB even though we fill an ImageReader
-        // Surface declared as RGBA_8888.
-        // Doing this allows us to directly match an Android Bitmap which also
-        // as the ARGB_8888 format (BGRA and ARGB are essentially the same data
-        // seen from a different endianness perspective).
-        SkImageInfo imageInfo =
-                SkImageInfo::Make(width, height, SkColorType::kBGRA_8888_SkColorType,
-                                  SkAlphaType::kPremul_SkAlphaType);
+        // The ColorType param here must match the ColorType used by
+        // Bitmap.Config.ARGB_8888. Android Bitmap objects use kN32_SkColorType
+        // by default for Bitmap.Config.ARGB_8888. The value of this is
+        // determined at compile time based on architecture (either BGRA or
+        // RGBA). If other Android Bitmap configs are used, 'kN32_SkColorType'
+        // may not be correct.
+        SkImageInfo imageInfo = SkImageInfo::Make(width, height, kN32_SkColorType,
+                                                  SkAlphaType::kPremul_SkAlphaType);
         size_t widthBytes = width * 4;
         void* pixels = buffer->reserved[0];
         mSurface = SkSurface::MakeRasterDirect(imageInfo, pixels, widthBytes);