From 14724e6caf841e719bdbe1f4ac5cdcc70bc68a21 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Wed, 5 Dec 2018 07:27:30 -0800 Subject: [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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'services/surfaceflinger/DisplayDevice.cpp') diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 48fd47fdbe..2963a97608 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -98,7 +98,7 @@ const std::array sHdrRenderIntents = { 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 @@ void DisplayDevice::populateColorModes( 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; } -- cgit v1.2.3-59-g8ed1b