Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7729008c authored by Chia-I Wu's avatar Chia-I Wu Committed by android-build-merger
Browse files

Merge "surfaceflinger: initialize DisplayDevice data members" into pi-dev 

am: b82617e3

Change-Id: Ic4e6808a23458acf7558079aaa5d8b0cacbb78c0
parents 8e60cc26 b82617e3

services/surfaceflinger/DisplayDevice.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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),

services/surfaceflinger/DisplayDevice.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+1 −4
Original line number Diff line number Diff line
@@ -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);

    }

};