commit 3a49f6f506ce9f17b721d4cc8243781c3f91f149
author Daniel Solomon <solomondaniel@google.com> Tue Jul 16 22:28:00 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 16 22:28:00 2019 +0000
tree 764c8d2ca37082cb8babd032a1fb965a658ca7c4
parent a91e361dc695978f80f8d419da84ffdbb66f54e9
parent 7c7ede2f3f23d509b0e15ceba4f889ca1beac28e

Merge "SF: Update forced composition color space along with color mode" into qt-r1-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 94eeef5..96d9e88 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5415,7 +5415,12 @@
                 return NO_ERROR;
             }
             case 1023: { // Set native mode
+                int32_t colorMode;
+
                 mDisplayColorSetting = static_cast<DisplayColorSetting>(data.readInt32());
+                if (data.readInt32(&colorMode) == NO_ERROR) {
+                    mForceColorMode = static_cast<ColorMode>(colorMode);
+                }
                 invalidateHwcGeometry();
                 repaintEverything();
                 return NO_ERROR;