commit db35c4956477823b245ae57a383554b46f0ecca4
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 11 23:57:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 11 23:57:42 2017 +0000
tree de94f2c278c2e9d64a9a2ed78ccb89a596d14f9a
parent fcae2e36ee3aa7ae09b5ee4173324a19725c83be
parent 901a86e1edd983968dda2218f87a35064114c08d

Merge "surfaceflinger: Set correct initial value for mActiveColorMode"

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;