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

Commit 7bcc6d6d authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Update SurfaceFlinger to use power V4 AIDL"

parents 468de9c8 b10b706a

libs/gui/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ cc_defaults { 
        "android.hardware.configstore-utils",

        "android.hardware.graphics.bufferqueue@1.0",

        "android.hardware.graphics.bufferqueue@2.0",

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

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

        "android.hidl.token@1.0",

        "libSurfaceFlingerProp",

        "libgui",

services/surfaceflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.4",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

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

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

        "libbase",

        "libbinder",

        "libbinder_ndk",

services/surfaceflinger/CompositionEngine/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.4",

        "android.hardware.power@1.0",

        "android.hardware.power@1.3",

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

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

        "libbase",

        "libcutils",

        "libgui",

services/surfaceflinger/tests/unittests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ cc_defaults { 
        "android.hardware.power@1.1",

        "android.hardware.power@1.2",

        "android.hardware.power@1.3",

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

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

        "libaidlcommonsupport",

        "libcompositionengine_mocks",

        "libcompositionengine",

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

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


using android::binder::Status;

using android::hardware::power::IPowerHintSession;

using android::hardware::power::SessionHint;



using namespace android::hardware::power;
@@ -40,6 +41,7 @@ public: 
    MOCK_METHOD(std::string, getInterfaceHash, (), (override));

    MOCK_METHOD(Status, updateTargetWorkDuration, (int64_t), (override));

    MOCK_METHOD(Status, reportActualWorkDuration, (const ::std::vector<WorkDuration>&), (override));

    MOCK_METHOD(Status, sendHint, (SessionHint), (override));

};



} // namespace android::Hwc2::mock