commit 7112a113559d8f90d5497458f8960bda6c445f35
author Chia-I Wu <olv@google.com> Mon May 07 15:27:06 2018 -0700
committer Chia-I Wu <olv@google.com> Mon May 07 15:27:06 2018 -0700
tree f9f47c3e2c1db17cddc8d96d97a9992e6d13e0f3
parent 5fb33ea6b2acc8fee1a8f86278734927acfd7538
parent 7a28ecb9bdbc1697bdf08804e47a512291e0b878

resolve merge conflicts of 7a28ecb9 to master

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6bd39269f3a020e2bb9a7821aebeef73fc481974

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cb2172b..afa34d0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1859,7 +1859,7 @@
 
 // Returns a data space that fits all visible layers.  The returned data space
 // can only be one of
-//  - Dataspace::V0_SRGB
+//  - Dataspace::SRGB (use legacy dataspace and let HWC saturate when colors are enhanced)
 //  - Dataspace::DISPLAY_P3
 //  - Dataspace::V0_SCRGB_LINEAR
 // The returned HDR data space is one of
@@ -1868,7 +1868,7 @@
 //  - Dataspace::BT2020_PQ
 Dataspace SurfaceFlinger::getBestDataspace(
     const sp<const DisplayDevice>& displayDevice, Dataspace* outHdrDataSpace) const {
-    Dataspace bestDataSpace = Dataspace::V0_SRGB;
+    Dataspace bestDataSpace = Dataspace::SRGB;
     *outHdrDataSpace = Dataspace::UNKNOWN;
 
     for (const auto& layer : displayDevice->getVisibleLayersSortedByZ()) {
@@ -1878,7 +1878,7 @@
                 bestDataSpace = Dataspace::V0_SCRGB_LINEAR;
                 break;
             case Dataspace::DISPLAY_P3:
-                if (bestDataSpace == Dataspace::V0_SRGB) {
+                if (bestDataSpace == Dataspace::SRGB) {
                     bestDataSpace = Dataspace::DISPLAY_P3;
                 }
                 break;
@@ -1959,7 +1959,7 @@
                 break;
             default:
                 *outMode = ColorMode::SRGB;
-                *outDataSpace = Dataspace::V0_SRGB;
+                *outDataSpace = Dataspace::SRGB;
                 break;
         }
     }
@@ -2992,7 +2992,9 @@
             colorMatrix = mDrawingState.colorMatrix;
         }
 
-        applyLegacyColorMatrix = mDisplayColorSetting == DisplayColorSetting::ENHANCED;
+        applyLegacyColorMatrix = (mDisplayColorSetting == DisplayColorSetting::ENHANCED &&
+                outputDataspace != Dataspace::UNKNOWN &&
+                outputDataspace != Dataspace::SRGB);
         if (applyLegacyColorMatrix) {
             if (applyColorMatrix) {
                 legacyColorMatrix = colorMatrix * mLegacySrgbSaturationMatrix;