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

Commit 63b6eeb8 authored by Shubang Lu's avatar Shubang Lu Committed by Automerger Merge Worker
Browse files

Merge "Add default implementation for setTvMessageEnabled" into udc-dev am: b85319cc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23273998



Change-Id: I30af509263d6154f79e0dfacb56f503a63e9285b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f1368cf b85319cc

tv/input/aidl/default/TvInput.cpp

+7 −1
Original line number Diff line number Diff line
@@ -68,7 +68,13 @@ void TvInput::init() { 
::ndk::ScopedAStatus TvInput::setTvMessageEnabled(int32_t deviceId, int32_t streamId,

                                                  TvMessageEventType in_type, bool enabled) {

    ALOGV("%s", __FUNCTION__);

    // TODO: Implement this



    if (mStreamConfigs.count(deviceId) == 0) {

        ALOGW("Device with id %d isn't available", deviceId);

        return ::ndk::ScopedAStatus::fromServiceSpecificError(STATUS_INVALID_ARGUMENTS);

    }



    mTvMessageEventEnabled[deviceId][streamId][in_type] = enabled;

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

}

tv/input/aidl/default/TvInput.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <aidl/android/hardware/tv/input/TvMessageEventType.h>

#include <fmq/AidlMessageQueue.h>

#include <map>

#include <unordered_map>

#include "TvInputDeviceInfoWrapper.h"

#include "TvStreamConfigWrapper.h"
@@ -38,6 +39,9 @@ namespace hardware { 
namespace tv {

namespace input {



using TvMessageEnabledMap = std::unordered_map<

        int32_t, std::unordered_map<int32_t, std::unordered_map<TvMessageEventType, bool>>>;



class TvInput : public BnTvInput {

  public:

    TvInput();
@@ -62,6 +66,7 @@ class TvInput : public BnTvInput { 
    shared_ptr<ITvInputCallback> mCallback;

    map<int32_t, shared_ptr<TvInputDeviceInfoWrapper>> mDeviceInfos;

    map<int32_t, map<int32_t, shared_ptr<TvStreamConfigWrapper>>> mStreamConfigs;

    TvMessageEnabledMap mTvMessageEventEnabled;

};



}  // namespace input