commit e423acd4b5841b739a62dd2cf0a553075b781695
author Hongguang <hgchen@google.com> Tue Jul 27 16:56:47 2021 -0700
committer Hongguang <hgchen@google.com> Wed Jul 28 19:33:47 2021 -0700
tree dddd425a5723c2dd69cb935cb3e93f87cb39970e
parent 84d45ee9925ce6e9c62b335ac679cd6e686b0ced

Update tuner default AIDL HAL.

*) Use tuner AIDL HAL return values.
*) Replace mTunerService with mTuner to avoid confusing.
*) Merge other HIDL HAL changes.
   *) ag/15371813, ag/15371814 and ag/15371815.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: Ibbf94c4fc36c3bda94a7e0f3e0697c83ac414d0e

tv/tuner/aidl/default/Frontend.cpp

diff --git a/tv/tuner/aidl/default/Frontend.cpp b/tv/tuner/aidl/default/Frontend.cpp
index 2be13d3..7f7b989 100644
--- a/tv/tuner/aidl/default/Frontend.cpp
+++ b/tv/tuner/aidl/default/Frontend.cpp
@@ -17,9 +17,11 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "android.hardware.tv.tuner-service.example-Frontend"
 
-#include "Frontend.h"
+#include <aidl/android/hardware/tv/tuner/Result.h>
 #include <utils/Log.h>
 
+#include "Frontend.h"
+
 namespace aidl {
 namespace android {
 namespace hardware {
@@ -29,7 +31,7 @@
 Frontend::Frontend(FrontendType type, int32_t id, std::shared_ptr<Tuner> tuner) {
     mType = type;
     mId = id;
-    mTunerService = tuner;
+    mTuner = tuner;
     // Init callback to nullptr
     mCallback = nullptr;
 }
@@ -41,7 +43,7 @@
     // Reset callback
     mCallback = nullptr;
     mIsLocked = false;
-    mTunerService->removeFrontend(mId);
+    mTuner->removeFrontend(mId);
 
     return ::ndk::ScopedAStatus::ok();
 }
@@ -50,7 +52,8 @@
     ALOGV("%s", __FUNCTION__);
     if (in_callback == nullptr) {
         ALOGW("[   WARN   ] Set Frontend callback with nullptr");
-        return ::ndk::ScopedAStatus::fromExceptionCode(STATUS_INVALID_OPERATION);
+        return ::ndk::ScopedAStatus::fromServiceSpecificError(
+                static_cast<int32_t>(Result::INVALID_ARGUMENT));
     }
 
     mCallback = in_callback;
@@ -61,10 +64,11 @@
     ALOGV("%s", __FUNCTION__);
     if (mCallback == nullptr) {
         ALOGW("[   WARN   ] Frontend callback is not set when tune");
-        return ::ndk::ScopedAStatus::fromExceptionCode(STATUS_INVALID_OPERATION);
+        return ::ndk::ScopedAStatus::fromServiceSpecificError(
+                static_cast<int32_t>(Result::INVALID_STATE));
     }
 
-    mTunerService->frontendStartTune(mId);
+    mTuner->frontendStartTune(mId);
     mCallback->onEvent(FrontendEventType::LOCKED);
     mIsLocked = true;
 
@@ -74,7 +78,7 @@
 ::ndk::ScopedAStatus Frontend::stopTune() {
     ALOGV("%s", __FUNCTION__);
 
-    mTunerService->frontendStopTune(mId);
+    mTuner->frontendStopTune(mId);
     mIsLocked = false;
 
     return ::ndk::ScopedAStatus::ok();
@@ -82,9 +86,9 @@
 
 ::ndk::ScopedAStatus Frontend::scan(const FrontendSettings& in_settings, FrontendScanType in_type) {
     ALOGV("%s", __FUNCTION__);
-    FrontendScanMessage msg;
 
     if (mIsLocked) {
+        FrontendScanMessage msg;
         msg.set<FrontendScanMessage::Tag::isEnd>(true);
         mCallback->onScanMessage(FrontendScanMessageType::END, msg);
         return ::ndk::ScopedAStatus::ok();
@@ -675,7 +679,8 @@
 ::ndk::ScopedAStatus Frontend::setLnb(int32_t /* in_lnbId */) {
     ALOGV("%s", __FUNCTION__);
     if (!supportsSatellite()) {
-        return ::ndk::ScopedAStatus::fromExceptionCode(STATUS_INVALID_OPERATION);
+        return ::ndk::ScopedAStatus::fromServiceSpecificError(
+                static_cast<int32_t>(Result::INVALID_STATE));
     }
     return ::ndk::ScopedAStatus::ok();
 }