From 87e99a29aa98c9d3c178e6baaf4646e889811997 Mon Sep 17 00:00:00 2001
From: Leon Scroggins III <scroggo@google.com>
Date: Tue, 9 Apr 2019 08:55:28 -0400
Subject: [PATCH] Ensure that hardware Bitmap has a ColorSpace

Bug: 129355537
Test: I9e004fbb7c966bb58ae374087fecd66a1bb72346

android_view_ThreadedRenderer_createHardwareBitmapFromRenderNode in
SkiaGL could create an android::Bitmap without an SkColorSpace. Treat
HAL_DATASPACE_UNKNOWN as sRGB, as this is how we treat it internally.

Change-Id: Iad7f7d7cafce0a8759a84a4296ae5c3ce86dff4c
(cherry picked from commit 7fb4c9e4bb10e17d28a09bd84d364171359a1941)
Merged-In: Iad7f7d7cafce0a8759a84a4296ae5c3ce86dff4c
---
 libs/hwui/utils/Color.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/hwui/utils/Color.cpp b/libs/hwui/utils/Color.cpp
index d14116f7b555b..39740bd46f9fd 100644
--- a/libs/hwui/utils/Color.cpp
+++ b/libs/hwui/utils/Color.cpp
@@ -60,6 +60,9 @@ SkColorType PixelFormatToColorType(android::PixelFormat format) {
 }
 
 sk_sp<SkColorSpace> DataSpaceToColorSpace(android_dataspace dataspace) {
+    if (dataspace == HAL_DATASPACE_UNKNOWN) {
+        return SkColorSpace::MakeSRGB();
+    }
 
     skcms_Matrix3x3 gamut;
     switch (dataspace & HAL_DATASPACE_STANDARD_MASK) {