commit e72a1c31f62de4798fcf71ea49e688140ea94e34
author Courtney Goeltzenleuchter <courtneygo@google.com> Tue Apr 25 13:33:39 2017 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Wed Apr 26 15:47:58 2017 -0600
tree 61a8b4bec3db3ed8812476454d0bd818c3f16f6c
parent cdc3cdf21c5329445e20f56201826b67271e656a

Set default color mode for all displays

Virtual displays were not getting their color mode set
and that confused SurfaceFlinger when it was working with
virtual displays. Now set the display to the same default
color mode as the default display.
Test: b/37102733
      Should not see screen turn green when enabling
      "simulate secondary displays" function.
bug: 37102733

Change-Id: I4d8f9e8d5c191623a286b03a05841bdeb20718b1

services/surfaceflinger/DisplayDevice.cpp

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