commit 077cc1fe603b49bae0b7db42cfc65fa5f1d7b57d
author Amy Zhang <amyjojo@google.com> Thu Jan 14 18:54:07 2021 -0800
committer Amy Zhang <amyjojo@google.com> Thu Jan 14 18:54:51 2021 -0800
tree b66934d05580f107fa60a3c993bb58e49a130b1e
parent a046eeef9045fb0b1e5b84689251b8ab79f1e16f

Implement TunerLnb interface APIs

Test: make libtunerservice
Bug: 159067322
Change-Id: I4f54e68fede3878afff96cb4959a831d377e975f

services/tuner/TunerLnb.cpp

diff --git a/services/tuner/TunerLnb.cpp b/services/tuner/TunerLnb.cpp
index 18aa11e..0bfa3fd 100644
--- a/services/tuner/TunerLnb.cpp
+++ b/services/tuner/TunerLnb.cpp
@@ -18,6 +18,9 @@
 
 #include "TunerLnb.h"
 
+using ::android::hardware::tv::tuner::V1_0::LnbPosition;
+using ::android::hardware::tv::tuner::V1_0::LnbTone;
+using ::android::hardware::tv::tuner::V1_0::LnbVoltage;
 using ::android::hardware::tv::tuner::V1_0::Result;
 
 namespace android {
@@ -45,31 +48,57 @@
 
     sp<ILnbCallback> lnbCallback = new LnbCallback(tunerLnbCallback);
     Result status = mLnb->setCallback(lnbCallback);
-    if (status == Result::SUCCESS) {
-        return Status::ok();
-    }
-
     return Status::fromServiceSpecificError(static_cast<int32_t>(status));
 }
 
-Status TunerLnb::setVoltage(int /*voltage*/) {
-    return Status::ok();
+Status TunerLnb::setVoltage(int voltage) {
+    if (mLnb == NULL) {
+        ALOGE("ILnb is not initialized");
+        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
+    }
+
+    Result status = mLnb->setVoltage(static_cast<LnbVoltage>(voltage));
+    return Status::fromServiceSpecificError(static_cast<int32_t>(status));
 }
 
-Status TunerLnb::setTone(int /*voltage*/) {
-    return Status::ok();
+Status TunerLnb::setTone(int tone) {
+    if (mLnb == NULL) {
+        ALOGE("ILnb is not initialized");
+        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
+    }
+
+    Result status = mLnb->setTone(static_cast<LnbTone>(tone));
+    return Status::fromServiceSpecificError(static_cast<int32_t>(status));
 }
 
-Status TunerLnb::setSatellitePosition(int /*position*/) {
-    return Status::ok();
+Status TunerLnb::setSatellitePosition(int position) {
+    if (mLnb == NULL) {
+        ALOGE("ILnb is not initialized");
+        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
+    }
+
+    Result status = mLnb->setSatellitePosition(static_cast<LnbPosition>(position));
+    return Status::fromServiceSpecificError(static_cast<int32_t>(status));
 }
 
-Status TunerLnb::sendDiseqcMessage(const vector<uint8_t>& /*diseqcMessage*/) {
-    return Status::ok();
+Status TunerLnb::sendDiseqcMessage(const vector<uint8_t>& diseqcMessage) {
+    if (mLnb == NULL) {
+        ALOGE("ILnb is not initialized");
+        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
+    }
+
+    Result status = mLnb->sendDiseqcMessage(diseqcMessage);
+    return Status::fromServiceSpecificError(static_cast<int32_t>(status));
 }
 
 Status TunerLnb::close() {
-    return Status::ok();
+    if (mLnb == NULL) {
+        ALOGE("ILnb is not initialized");
+        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
+    }
+
+    Result status = mLnb->close();
+    return Status::fromServiceSpecificError(static_cast<int32_t>(status));
 }
 
 /////////////// ILnbCallback ///////////////////////

services/tuner/TunerLnb.h

diff --git a/services/tuner/TunerLnb.h b/services/tuner/TunerLnb.h
index 19ba3c2..e80b97e 100644
--- a/services/tuner/TunerLnb.h
+++ b/services/tuner/TunerLnb.h
@@ -44,7 +44,7 @@
     virtual ~TunerLnb();
     Status setCallback(const shared_ptr<ITunerLnbCallback>& tunerLnbCallback) override;
     Status setVoltage(int voltage) override;
-    Status setTone(int voltage) override;
+    Status setTone(int tone) override;
     Status setSatellitePosition(int position) override;
     Status sendDiseqcMessage(const vector<uint8_t>& diseqcMessage) override;
     Status close() override;