diff options
| author | 2023-06-03 14:27:11 +0000 | |
|---|---|---|
| committer | 2023-06-03 14:27:11 +0000 | |
| commit | 130b62c3391e7b50c937ace6eefb237403c1693b (patch) | |
| tree | 9c6bdb7bd95a61c58680a567d7f609cd74c0fb87 | |
| parent | cda0139fe8540b3b05af8800d2ae07a92cdd04da (diff) | |
| parent | 30f0d321c66ba665d9214ac71ca348b745f58093 (diff) | |
Merge "Mock init of PowerHalController in test" into udc-qpr-dev am: 30f0d321c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23483476
Change-Id: Ic44a3675c1e734a3bd580e354bc519a5a69e57e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | include/powermanager/PowerHalController.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/powermanager/PowerHalController.h b/include/powermanager/PowerHalController.h index 71a36d09e5..82e4551c3c 100644 --- a/include/powermanager/PowerHalController.h +++ b/include/powermanager/PowerHalController.h @@ -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; diff --git a/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h index 358395d323..8e22f43b76 100644 --- a/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h +++ b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h @@ -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, |