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

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

Revert "Revert "Add HAL method to return SupportInfo object for ..." 

Revert submission 30089224-revert-29740067-support_info-AZFGLTWWRM

Reason for revert: It actually does work

Reverted changes: /q/submissionid:30089224-revert-29740067-support_info-AZFGLTWWRM

Change-Id: I92fa42ba04c1633814bee879ff4d4d07fe7fb66e
parent a012ed36

services/powermanager/tests/PowerHalWrapperAidlTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 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;
@@ -65,6 +66,7 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 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;
@@ -59,6 +60,7 @@ 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));