commit 14724e6caf841e719bdbe1f4ac5cdcc70bc68a21
author Peiyong Lin <lpy@google.com> Wed Dec 05 07:27:30 2018 -0800
committer Peiyong Lin <lpy@google.com> Mon Dec 10 19:23:43 2018 -0800
tree e0837b681dc63f02e6a23bdc2e8ff9595d046d01
parent 616aca2f670caf55c3b87fe53996a2e3bf99ab93

[SurfaceFlinger] Remove usage of legacy data spaces.

Replace the legacy data spaces with modern data spaces.

BUG: 80490445
Test: Build, flash and boot. Check Color preference settings.
Change-Id: I738be45ba42997ae6604c2a3cbcff0d7b43e7141

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 48fd47f..2963a97 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -98,7 +98,7 @@
 Dataspace colorModeToDataspace(ColorMode mode) {
     switch (mode) {
         case ColorMode::SRGB:
-            return Dataspace::SRGB;
+            return Dataspace::V0_SRGB;
         case ColorMode::DISPLAY_P3:
             return Dataspace::DISPLAY_P3;
         case ColorMode::DISPLAY_BT2020:
@@ -817,7 +817,7 @@
 bool DisplayDevice::hasRenderIntent(RenderIntent intent) const {
     // assume a render intent is supported when SRGB supports it; we should
     // get rid of that assumption.
-    auto iter = mColorModes.find(getColorModeKey(Dataspace::SRGB, intent));
+    auto iter = mColorModes.find(getColorModeKey(Dataspace::V0_SRGB, intent));
     return iter != mColorModes.end() && iter->second.renderIntent == intent;
 }