commit 901a86e1edd983968dda2218f87a35064114c08d
author Naseer Ahmed <naseer@codeaurora.org> Thu May 11 11:15:21 2017 -0400
committer Romain Guy <romainguy@google.com> Thu May 11 09:59:43 2017 -0700
tree 9d6910301c4b7d844e7a5970d47e33a75a9a37cf
parent 3defa56f66e5583189cbd56bfde8afc66fce83df

surfaceflinger: Set correct initial value for mActiveColorMode

HWC always initializes with the native mode, setting
mActiveColorMode to sRGB here without actually calling
setColorMode on HWC will cause framework to think that it is in
sRGB mode already, when the mode has not been set yet.

Bug: 38207860
Test: Compile and boot
Change-Id: I492c07ce542f5a448ff4c7d2f18e72629fc6cd78

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 4d0c085..a0abf12 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -121,8 +121,7 @@
     ANativeWindow* const window = mNativeWindow.get();
 
 #ifdef USE_HWC2
-    // Set defaultColorMode to SRGB if this device supports wide-color
-    mActiveColorMode = (supportWideColor) ? HAL_COLOR_MODE_SRGB : HAL_COLOR_MODE_NATIVE;
+    mActiveColorMode = HAL_COLOR_MODE_NATIVE;
     mDisplayHasWideColor = supportWideColor;
 #else
     (void) supportWideColor;