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

Commit 0538caea authored by Matt Buckley's avatar Matt Buckley
Browse files

Rewrite the PowerAdvisor using standard power wrappers and clean up 

* Replace custom AIDL/HIDL wrappers with libpowermanager
* Remove early hint code as it is deprecated for load change hints

Bug: b/245975645
Bug: b/244358432
Test: atest libsurfaceflinger_unittest

Change-Id: I2a11779ce1f78bcf29ea0e7978cb8933e74e9f7b
Merged-In: I2a11779ce1f78bcf29ea0e7978cb8933e74e9f7b
(cherry picked from commit cbfe23c9)
parent db913040

services/powermanager/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,14 @@ cc_library_shared { 
        "android.hardware.power-V4-cpp",

    ],



    export_shared_lib_headers: [

        "android.hardware.power@1.0",

        "android.hardware.power@1.1",

        "android.hardware.power@1.2",

        "android.hardware.power@1.3",

        "android.hardware.power-V4-cpp",

    ],



    cflags: [

        "-Wall",

        "-Werror",

services/surfaceflinger/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

        "android.hardware.power-V4-cpp",

        "libbase",

        "libbinder",
@@ -63,6 +61,7 @@ cc_defaults { 
        "liblayers_proto",

        "liblog",

        "libnativewindow",

        "libpowermanager",

        "libprocessgroup",

        "libprotobuf-cpp-lite",

        "libsync",
@@ -105,7 +104,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer@2.3",

        "android.hardware.graphics.composer@2.4",

        "android.hardware.power@1.3",

        "libpowermanager",

        "libhidlbase",

        "libtimestats",

    ],

services/surfaceflinger/CompositionEngine/tests/MockPowerAdvisor.h

+4 −5
Original line number Diff line number Diff line
@@ -37,11 +37,10 @@ public: 
    MOCK_METHOD(void, notifyDisplayUpdateImminentAndCpuReset, (), (override));

    MOCK_METHOD(bool, usePowerHintSession, (), (override));

    MOCK_METHOD(bool, supportsPowerHintSession, (), (override));

    MOCK_METHOD(bool, isPowerHintSessionRunning, (), (override));

    MOCK_METHOD(void, setTargetWorkDuration, (Duration targetDuration), (override));

    MOCK_METHOD(void, sendActualWorkDuration, (), (override));

    MOCK_METHOD(void, sendPredictedWorkDuration, (), (override));

    MOCK_METHOD(void, enablePowerHint, (bool enabled), (override));

    MOCK_METHOD(bool, ensurePowerHintSessionRunning, (), (override));

    MOCK_METHOD(void, updateTargetWorkDuration, (Duration targetDuration), (override));

    MOCK_METHOD(void, reportActualWorkDuration, (), (override));

    MOCK_METHOD(void, enablePowerHintSession, (bool enabled), (override));

    MOCK_METHOD(bool, startPowerHintSession, (const std::vector<int32_t>& threadIds), (override));

    MOCK_METHOD(void, setGpuFenceTime,

                (DisplayId displayId, std::unique_ptr<FenceTime>&& fenceTime), (override));