diff options
Diffstat (limited to 'services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h')
| -rw-r--r-- | services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h index c2c5072b24..cb3bd73920 100644 --- a/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h +++ b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockComposer.h @@ -24,8 +24,7 @@ namespace android { class GraphicBuffer; -namespace Hwc2 { -namespace mock { +namespace Hwc2::mock { using android::hardware::graphics::common::V1_0::ColorTransform; using android::hardware::graphics::common::V1_0::Transform; @@ -52,12 +51,11 @@ public: MOCK_METHOD0(getCapabilities, std::vector<IComposer::Capability>()); MOCK_METHOD0(dumpDebugInfo, std::string()); MOCK_METHOD1(registerCallback, void(const sp<IComposerCallback>&)); - MOCK_METHOD0(isRemote, bool()); MOCK_METHOD0(resetCommands, void()); MOCK_METHOD0(executeCommands, Error()); MOCK_METHOD0(getMaxVirtualDisplayCount, uint32_t()); - MOCK_CONST_METHOD0(isUsingVrComposer, bool()); - MOCK_METHOD4(createVirtualDisplay, Error(uint32_t, uint32_t, PixelFormat*, Display*)); + MOCK_METHOD5(createVirtualDisplay, + Error(uint32_t, uint32_t, PixelFormat*, std::optional<Display>, Display*)); MOCK_METHOD1(destroyVirtualDisplay, Error(Display)); MOCK_METHOD1(acceptDisplayChanges, Error(Display)); MOCK_METHOD2(createLayer, Error(Display, Layer* outLayer)); @@ -110,7 +108,6 @@ public: MOCK_METHOD3(setLayerVisibleRegion, Error(Display, Layer, const std::vector<IComposerClient::Rect>&)); MOCK_METHOD3(setLayerZOrder, Error(Display, Layer, uint32_t)); - MOCK_METHOD4(setLayerInfo, Error(Display, Layer, uint32_t, uint32_t)); MOCK_METHOD3(getRenderIntents, Error(Display, ColorMode, std::vector<RenderIntent>*)); MOCK_METHOD3(setLayerColorTransform, Error(Display, Layer, const float*)); MOCK_METHOD4(getDisplayedContentSamplingAttributes, @@ -143,6 +140,5 @@ public: MOCK_METHOD2(getClientTargetProperty, Error(Display, IComposerClient::ClientTargetProperty*)); }; -} // namespace mock -} // namespace Hwc2 +} // namespace Hwc2::mock } // namespace android |