commit 8cabfc3ed343006a7d4faeb057f9164399c3b00d
author Peiyong Lin <lpy@google.com> Fri Jun 14 14:25:43 2019 -0700
committer Peiyong Lin <lpy@google.com> Fri Jun 14 14:27:31 2019 -0700
tree 31cd7ccaeabdc9ab695bc5ac51dacc9985ce2556
parent 4f65d3377b9f3b83fa75b94ccc7b459b98376b11

Query legacy ConfigStore for use color management API.

Default wide color gamut dataspace to Display P3 if the display is wide color display.

BUG: 124208726
Test: atest android.uirendering.cts.testclasses.WideColorGamutTests
Change-Id: I485a3636951a0fd4c4701c97eb3632542815a7d9

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index dd75868..53e67d4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -302,8 +302,8 @@
 
     mDefaultCompositionDataspace =
             static_cast<ui::Dataspace>(default_composition_dataspace(Dataspace::V0_SRGB));
-    mWideColorGamutCompositionDataspace =
-            static_cast<ui::Dataspace>(wcg_composition_dataspace(Dataspace::V0_SRGB));
+    mWideColorGamutCompositionDataspace = static_cast<ui::Dataspace>(wcg_composition_dataspace(
+            hasWideColorDisplay ? Dataspace::DISPLAY_P3 : Dataspace::V0_SRGB));
     defaultCompositionDataspace = mDefaultCompositionDataspace;
     wideColorGamutCompositionDataspace = mWideColorGamutCompositionDataspace;
     defaultCompositionPixelFormat = static_cast<ui::PixelFormat>(