diff options
| author | 2023-06-03 15:10:59 +0000 | |
|---|---|---|
| committer | 2023-06-03 15:10:59 +0000 | |
| commit | eb6198256cd2dc72cb31b5c7bad99a8b1247fd05 (patch) | |
| tree | bff1dbfedd9bd292325da6fc64b273c2f501ad00 | |
| parent | 4b32a97889f3c1843cbd41ce3661d9c278a73000 (diff) | |
| parent | 130b62c3391e7b50c937ace6eefb237403c1693b (diff) | |
Merge "Mock init of PowerHalController in test" into udc-qpr-dev am: 30f0d321c6 am: 130b62c339
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23483476
Change-Id: Iccc1ed5af5c07f9d4d3d1cd3b44df87efac9e5c5
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 32ceb2805b..9e426d3ea3 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(aidl::android::hardware::power::Boost boost, int32_t durationMs) override; diff --git a/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h b/services/surfaceflinger/tests/unittests/mock/DisplayHardware/MockPowerHalController.h index c8269302b1..68fe3c52d4 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<std::shared_ptr<aidl::android::hardware::power::IPowerHintSession>>, |