diff options
| author | Chia-I Wu <olv@google.com> | 2018-05-23 18:02:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-23 18:02:40 +0000 |
| commit | b82617e351b7d53fd10121d896ba0905dc80186b (patch) | |
| tree | 56b1cc43fd6df52b2a12ec3420d2340fec2c6a25 | |
| parent | 6c14d4634f6f4e79411d391fb60c5aab39d23985 (diff) | |
| parent | 437efc23c261adca2d10f4c40d09b145ed9e35b3 (diff) | |
| download | native-b82617e351b7d53fd10121d896ba0905dc80186b.tar.gz | |
Merge "surfaceflinger: initialize DisplayDevice data members" into pi-dev
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/DisplayDevice.h | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 2b1e5775ba..f6eac8b08a 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -100,7 +100,6 @@ DisplayDevice::DisplayDevice( mFrame(Rect::INVALID_RECT), mPowerMode(initialPowerMode), mActiveConfig(0), - mActiveColorMode(ColorMode::NATIVE), mColorTransform(HAL_COLOR_TRANSFORM_IDENTITY), mHasWideColorGamut(hasWideColorGamut), mHasHdr10(false), diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index b4100ce976..883f53313a 100644 --- a/services/surfaceflinger/DisplayDevice.h +++ b/services/surfaceflinger/DisplayDevice.h @@ -272,10 +272,10 @@ private: // Current active config int mActiveConfig; // current active color mode - ui::ColorMode mActiveColorMode; + ui::ColorMode mActiveColorMode = ui::ColorMode::NATIVE; // Current active render intent. - ui::RenderIntent mActiveRenderIntent; - ui::Dataspace mCompositionDataSpace; + ui::RenderIntent mActiveRenderIntent = ui::RenderIntent::COLORIMETRIC; + ui::Dataspace mCompositionDataSpace = ui::Dataspace::UNKNOWN; // Current color transform android_color_transform_t mColorTransform; diff --git a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp index cd691282d0..9b308bfcc8 100644 --- a/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp +++ b/services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp @@ -505,10 +505,7 @@ struct WideColorNotSupportedVariant { 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); } }; |