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

Commit 48ae0d86 authored by David Zhao's avatar David Zhao Committed by Android (Google) Code Review
Browse files

Merge "Add default implementation for notifyTvMessageEvent"

parents fe01a033 7b84397c

services/core/jni/tvinput/JTvInputHal.cpp

+6 −0
Original line number Diff line number Diff line
@@ -338,6 +338,12 @@ JTvInputHal::TvInputCallback::TvInputCallback(JTvInputHal* hal) { 
    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus JTvInputHal::TvInputCallback::notifyTvMessageEvent(

        const AidlTvMessageEvent& event) {

    // TODO: Implement this

    return ::ndk::ScopedAStatus::ok();

}



JTvInputHal::ITvInputWrapper::ITvInputWrapper(std::shared_ptr<AidlITvInput>& aidlTvInput)

      : mIsHidl(false), mAidlTvInput(aidlTvInput) {}

services/core/jni/tvinput/JTvInputHal.h

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ using AidlITvInput = ::aidl::android::hardware::tv::input::ITvInput; 
using AidlNativeHandle = ::aidl::android::hardware::common::NativeHandle;

using AidlTvInputDeviceInfo = ::aidl::android::hardware::tv::input::TvInputDeviceInfo;

using AidlTvInputEvent = ::aidl::android::hardware::tv::input::TvInputEvent;

using AidlTvMessageEvent = ::aidl::android::hardware::tv::input::TvMessageEvent;

using AidlTvStreamConfig = ::aidl::android::hardware::tv::input::TvStreamConfig;



extern gTvInputHalClassInfoType gTvInputHalClassInfo;
@@ -131,6 +132,7 @@ private: 
    public:

        explicit TvInputCallback(JTvInputHal* hal);

        ::ndk::ScopedAStatus notify(const AidlTvInputEvent& event) override;

        ::ndk::ScopedAStatus notifyTvMessageEvent(const AidlTvMessageEvent& event) override;

        Return<void> notify(const HidlTvInputEvent& event) override;



    private: