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

Commit 2db4e9e2 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add HAL method to return SupportInfo object for PowerHAL"" into main

parents f0b5ceef a012ed36

services/powermanager/tests/PowerHalWrapperAidlTest.cpp

+0 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ using aidl::android::hardware::power::IPowerHintSession; 
using aidl::android::hardware::power::Mode;

using aidl::android::hardware::power::SessionConfig;

using aidl::android::hardware::power::SessionTag;

using aidl::android::hardware::power::SupportInfo;

using android::binder::Status;



using namespace android;
@@ -66,7 +65,6 @@ public: 
                (int32_t tgid, int32_t uid, ChannelConfig* _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, closeSessionChannel, (int32_t tgid, int32_t uid), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getHintSessionPreferredRate, (int64_t * rate), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getSupportInfo, (SupportInfo * _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceVersion, (int32_t * version), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceHash, (std::string * hash), (override));

    MOCK_METHOD(ndk::SpAIBinder, asBinder, (), (override));

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

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ using aidl::android::hardware::power::IPower; 
using aidl::android::hardware::power::IPowerHintSession;

using aidl::android::hardware::power::SessionConfig;

using aidl::android::hardware::power::SessionTag;

using aidl::android::hardware::power::SupportInfo;



using aidl::android::hardware::power::Mode;

using android::binder::Status;
@@ -60,7 +59,6 @@ public: 
    MOCK_METHOD(ndk::ScopedAStatus, getSessionChannel,

                (int32_t tgid, int32_t uid, ChannelConfig* _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, closeSessionChannel, (int32_t tgid, int32_t uid), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getSupportInfo, (SupportInfo * _aidl_return), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceVersion, (int32_t * version), (override));

    MOCK_METHOD(ndk::ScopedAStatus, getInterfaceHash, (std::string * hash), (override));

    MOCK_METHOD(ndk::SpAIBinder, asBinder, (), (override));