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

Commit 130b62c3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mock init of PowerHalController in test" into udc-qpr-dev am: 30f0d321 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23483476



Change-Id: Ic44a3675c1e734a3bd580e354bc519a5a69e57e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cda0139f 30f0d321

include/powermanager/PowerHalController.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public: 
          : mHalConnector(std::move(connector)) {}

    virtual ~PowerHalController() = default;



    void init();

    virtual void init();



    virtual HalResult<void> setBoost(hardware::power::Boost boost, int32_t durationMs) override;

    virtual HalResult<void> setMode(hardware::power::Mode mode, bool enabled) override;

services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class MockPowerHalController : public power::PowerHalController { 
public:

    MockPowerHalController();

    ~MockPowerHalController() override;

    MOCK_METHOD(void, init, (), (override));

    MOCK_METHOD(HalResult<void>, setBoost, (Boost, int32_t), (override));

    MOCK_METHOD(HalResult<void>, setMode, (Mode, bool), (override));

    MOCK_METHOD(HalResult<sp<hardware::power::IPowerHintSession>>, createHintSession,