Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 05:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Enable LnbCallback in hidl/aidl default tuner implementation"

Browse Source
This commit is contained in:
Kensuke Miyagi
2022-01-13 05:06:48 +00:00
committed by Android (Google) Code Review
parent b0a51841f7 afe17c5093
commit efbebcdf45
6 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tv/tuner/1.0/default/Lnb.cpp
View File

@@ -33,9 +33,10 @@ Lnb::Lnb(int id) {
Lnb::~Lnb() {}
Return<Result> Lnb::setCallback(const sp<ILnbCallback>& /* callback */) {
Return<Result> Lnb::setCallback(const sp<ILnbCallback>& callback) {
ALOGV("%s", __FUNCTION__);
mCallback = callback;
return Result::SUCCESS;
}
@@ -57,9 +58,16 @@ Return<Result> Lnb::setSatellitePosition(LnbPosition /* position */) {
return Result::SUCCESS;
}
Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& /* diseqcMessage */) {
Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& diseqcMessage) {
ALOGV("%s", __FUNCTION__);
if (mCallback != nullptr) {
// The correct implementation should be to return the response from the
// device via onDiseqcMessage(). The below implementation is only to enable
// testing for LnbCallbacks.
ALOGV("[hidl] %s - this is for test purpose only, and must be replaced!", __FUNCTION__);
mCallback->onDiseqcMessage(diseqcMessage);
}
return Result::SUCCESS;
}

1
tv/tuner/1.0/default/Lnb.h
View File

@@ -57,6 +57,7 @@ class Lnb : public ILnb {
private:
int mId;
virtual ~Lnb();
sp<ILnbCallback> mCallback;
};
} // namespace implementation

12
tv/tuner/1.1/default/Lnb.cpp
View File

@@ -33,9 +33,10 @@ Lnb::Lnb(int id) {
Lnb::~Lnb() {}
Return<Result> Lnb::setCallback(const sp<ILnbCallback>& /* callback */) {
Return<Result> Lnb::setCallback(const sp<ILnbCallback>& callback) {
ALOGV("%s", __FUNCTION__);
mCallback = callback;
return Result::SUCCESS;
}
@@ -57,9 +58,16 @@ Return<Result> Lnb::setSatellitePosition(LnbPosition /* position */) {
return Result::SUCCESS;
}
Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& /* diseqcMessage */) {
Return<Result> Lnb::sendDiseqcMessage(const hidl_vec<uint8_t>& diseqcMessage) {
ALOGV("%s", __FUNCTION__);
if (mCallback != nullptr) {
// The correct implementation should be to return the response from the
// device via onDiseqcMessage(). The below implementation is only to enable
// testing for LnbCallbacks.
ALOGV("[hidl] %s - this is for test purpose only, and must be replaced!", __FUNCTION__);
mCallback->onDiseqcMessage(diseqcMessage);
}
return Result::SUCCESS;
}

1
tv/tuner/1.1/default/Lnb.h
View File

@@ -51,6 +51,7 @@ class Lnb : public ILnb {
private:
int mId;
virtual ~Lnb();
sp<ILnbCallback> mCallback;
};
} // namespace implementation

14
tv/tuner/aidl/default/Lnb.cpp
View File

@@ -34,9 +34,11 @@ Lnb::Lnb(int id) {
Lnb::~Lnb() {}
::ndk::ScopedAStatus Lnb::setCallback(const std::shared_ptr<ILnbCallback>& /* in_callback */) {
::ndk::ScopedAStatus Lnb::setCallback(const std::shared_ptr<ILnbCallback>& in_callback) {
ALOGV("%s", __FUNCTION__);
mCallback = in_callback;
return ::ndk::ScopedAStatus::ok();
}
@@ -58,9 +60,17 @@ Lnb::~Lnb() {}
return ::ndk::ScopedAStatus::ok();
}
::ndk::ScopedAStatus Lnb::sendDiseqcMessage(const std::vector<uint8_t>& /* in_diseqcMessage */) {
::ndk::ScopedAStatus Lnb::sendDiseqcMessage(const std::vector<uint8_t>& in_diseqcMessage) {
ALOGV("%s", __FUNCTION__);
if (mCallback != nullptr) {
// The correct implementation should be to return the response from the
// device via onDiseqcMessage(). The below implementation is only to enable
// testing for LnbCallbacks.
ALOGV("[aidl] %s - this is for test purpose only, and must be replaced!", __FUNCTION__);
mCallback->onDiseqcMessage(in_diseqcMessage);
}
return ::ndk::ScopedAStatus::ok();
}

1
tv/tuner/aidl/default/Lnb.h
View File

@@ -44,6 +44,7 @@ class Lnb : public BnLnb {
private:
int mId;
virtual ~Lnb();
std::shared_ptr<ILnbCallback> mCallback;
};
} // namespace tuner