commit 614e142ca15e308ee1c3373970381bbc36d26a44
author Chia-I Wu <olv@google.com> Wed May 23 02:17:03 2018 -0700
committer Chia-I Wu <olv@google.com> Wed May 23 20:59:03 2018 +0000
tree 24d592c7cb96f836647dbe17cb343f0611e88435
parent 45c41a890974b33382ef5a068275b1f9e5cae227

surfaceflinger: initialize DisplayDevice data members

Initialize mActiveRenderIntent and mCompositionDataSpace.

Bug: 80170891
Test: libsurfaceflinger_unittest
Change-Id: I7af510679f94332509b39a7ee54f68ff767c3da7
(cherry picked from commit 437efc23c261adca2d10f4c40d09b145ed9e35b3)

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
index ec98661..6621438 100644
--- a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
+++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp
@@ -507,10 +507,7 @@
     static void setupComposerCallExpectations(DisplayTransactionTest* test) {
         EXPECT_CALL(*test->mComposer, getColorModes(Display::HWC_DISPLAY_ID, _))
                 .WillOnce(DoAll(SetArgPointee<1>(std::vector<ColorMode>()), Return(Error::NONE)));
-        EXPECT_CALL(*test->mComposer,
-                    setColorMode(Display::HWC_DISPLAY_ID, ColorMode::NATIVE,
-                                 RenderIntent::COLORIMETRIC))
-                .WillOnce(Return(Error::NONE));
+        EXPECT_CALL(*test->mComposer, setColorMode(_, _, _)).Times(0);
     }
 };