commit bbb44464990d0becd1c5eef77f85da82b8008534
author Chia-I Wu <olv@google.com> Mon May 21 15:33:27 2018 -0700
committer Chia-I Wu <olv@google.com> Wed May 23 15:02:34 2018 -0700
tree 7a5e34d92ada8a151174d6e7d1213edde9116a64
parent 0607fbe8956a64151b165ac88ef9f3cf9b4ece5d

surfaceflinger: display color setting is a hint

Display color setting is merely a hint.  Check the active render
intent before applying the legacy sRGB color matrix.

Bug: 79843697
Test: manual
Change-Id: I73b45cbf2274a56037ce0439470f1baafffa8914

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e7e3eb3..fe9a1d0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2898,9 +2898,10 @@
             getRenderEngine().setupColorTransform(mDrawingState.colorMatrix);
         }
 
-        needsLegacyColorMatrix = (mDisplayColorSetting == DisplayColorSetting::ENHANCED &&
-                outputDataspace != Dataspace::UNKNOWN &&
-                outputDataspace != Dataspace::SRGB);
+        needsLegacyColorMatrix =
+            (displayDevice->getActiveRenderIntent() == RenderIntent::ENHANCE &&
+             outputDataspace != Dataspace::UNKNOWN &&
+             outputDataspace != Dataspace::SRGB);
 
         if (!displayDevice->makeCurrent()) {
             ALOGW("DisplayDevice::makeCurrent failed. Aborting surface composition for display %s",