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/Descrambler.cpp

diff --git a/tv/tuner/aidl/default/Descrambler.cpp b/tv/tuner/aidl/default/Descrambler.cpp
index 8af3a92..586db73 100644
--- a/tv/tuner/aidl/default/Descrambler.cpp
+++ b/tv/tuner/aidl/default/Descrambler.cpp
@@ -18,6 +18,7 @@
 #define LOG_TAG "android.hardware.tv.tuner-service.example-Descrambler"
 
 #include <aidl/android/hardware/tv/tuner/IFrontendCallback.h>
+#include <aidl/android/hardware/tv/tuner/Result.h>
 #include <utils/Log.h>
 
 #include "Descrambler.h"
@@ -37,7 +38,8 @@
     if (mDemuxSet) {
         ALOGW("[   WARN   ] Descrambler has already been set with a demux id %" PRIu32,
               mSourceDemuxId);
-        return ::ndk::ScopedAStatus::fromExceptionCode(STATUS_INVALID_OPERATION);
+        return ::ndk::ScopedAStatus::fromServiceSpecificError(
+                static_cast<int32_t>(Result::INVALID_STATE));
     }
     mDemuxSet = true;
     mSourceDemuxId = in_demuxId;