Use TunerFrontendInfo for both TRM and TunerService
Test: make
Bug: 172079283
Change-Id: I10a614ff8b83ad7227cea7285e87b7206eafae0d
diff --git a/services/tuner/Android.bp b/services/tuner/Android.bp
index fab6ea8..edccbf7 100644
--- a/services/tuner/Android.bp
+++ b/services/tuner/Android.bp
@@ -6,6 +6,15 @@
path: "aidl",
}
+filegroup {
+ name: "tv_tuner_frontend_info",
+ srcs: [
+ "aidl/android/media/tv/tuner/TunerFrontendInfo.aidl",
+ "aidl/android/media/tv/tuner/TunerFrontend*Capabilities.aidl",
+ ],
+ path: "aidl",
+}
+
aidl_interface {
name: "tv_tuner_aidl_interface",
unstable: true,
@@ -30,6 +39,27 @@
},
}
+aidl_interface {
+ name: "tv_tuner_frontend_info_aidl_interface",
+ unstable: true,
+ local_include_dir: "aidl",
+ srcs: [
+ ":tv_tuner_frontend_info",
+ ],
+
+ backend: {
+ java: {
+ enabled: true,
+ },
+ cpp: {
+ enabled: true,
+ },
+ ndk: {
+ enabled: true,
+ },
+ },
+}
+
cc_library {
name: "libtunerservice",
diff --git a/services/tuner/TunerService.cpp b/services/tuner/TunerService.cpp
index 99fc172..c34ddf6 100644
--- a/services/tuner/TunerService.cpp
+++ b/services/tuner/TunerService.cpp
@@ -221,7 +221,7 @@
}
Status TunerService::getFrontendInfo(
- int32_t frontendHandle, TunerServiceFrontendInfo* _aidl_return) {
+ int32_t frontendHandle, TunerFrontendInfo* _aidl_return) {
if (mTuner == nullptr) {
ALOGE("ITuner service is not init.");
return ::ndk::ScopedAStatus::fromServiceSpecificError(
@@ -239,7 +239,7 @@
return Status::fromServiceSpecificError(static_cast<int32_t>(res));
}
- TunerServiceFrontendInfo tunerInfo = convertToAidlFrontendInfo(feId, info);
+ TunerFrontendInfo tunerInfo = convertToAidlFrontendInfo(info);
*_aidl_return = tunerInfo;
return Status::ok();
}
@@ -257,9 +257,8 @@
return Status::ok();
}
-TunerServiceFrontendInfo TunerService::convertToAidlFrontendInfo(int feId, FrontendInfo halInfo) {
- TunerServiceFrontendInfo info{
- .id = feId,
+TunerFrontendInfo TunerService::convertToAidlFrontendInfo(FrontendInfo halInfo) {
+ TunerFrontendInfo info{
.type = (int)halInfo.type,
.minFrequency = (int)halInfo.minFrequency,
.maxFrequency = (int)halInfo.maxFrequency,
diff --git a/services/tuner/TunerService.h b/services/tuner/TunerService.h
index 8de6187..021ed26 100644
--- a/services/tuner/TunerService.h
+++ b/services/tuner/TunerService.h
@@ -18,7 +18,6 @@
#define ANDROID_MEDIA_TUNERSERVICE_H
#include <aidl/android/media/tv/tuner/BnTunerService.h>
-#include <aidl/android/media/tv/tuner/TunerServiceFrontendInfo.h>
#include <android/hardware/tv/tuner/1.0/ITuner.h>
#include <fmq/AidlMessageQueue.h>
#include <fmq/EventFlag.h>
@@ -29,7 +28,7 @@
using ::aidl::android::hardware::common::fmq::SynchronizedReadWrite;
using ::aidl::android::media::tv::tuner::BnTunerService;
using ::aidl::android::media::tv::tuner::ITunerFrontend;
-using ::aidl::android::media::tv::tuner::TunerServiceFrontendInfo;
+using ::aidl::android::media::tv::tuner::TunerFrontendInfo;
using ::android::hardware::details::logError;
using ::android::hardware::EventFlag;
@@ -86,7 +85,7 @@
}
Status getFrontendIds(std::vector<int32_t>* ids, int32_t* _aidl_return) override;
- Status getFrontendInfo(int32_t frontendHandle, TunerServiceFrontendInfo* _aidl_return) override;
+ Status getFrontendInfo(int32_t frontendHandle, TunerFrontendInfo* _aidl_return) override;
Status openFrontend(
int32_t frontendHandle, std::shared_ptr<ITunerFrontend>* _aidl_return) override;
Status getFmqSyncReadWrite(
@@ -110,7 +109,7 @@
MQDescriptorSync<uint8_t> mFilterMQDesc;
AidlMQDesc mAidlMQDesc;
EventFlag* mEventFlag;
- TunerServiceFrontendInfo convertToAidlFrontendInfo(int feId, FrontendInfo halInfo);
+ TunerFrontendInfo convertToAidlFrontendInfo(FrontendInfo halInfo);
};
} // namespace android
diff --git a/services/tuner/aidl/android/media/tv/tuner/ITunerFrontend.aidl b/services/tuner/aidl/android/media/tv/tuner/ITunerFrontend.aidl
index 4cd9ff5..2a54dc6 100644
--- a/services/tuner/aidl/android/media/tv/tuner/ITunerFrontend.aidl
+++ b/services/tuner/aidl/android/media/tv/tuner/ITunerFrontend.aidl
@@ -19,7 +19,6 @@
import android.media.tv.tuner.ITunerFrontendCallback;
import android.media.tv.tuner.TunerFrontendSettings;
import android.media.tv.tuner.TunerFrontendStatus;
-import android.media.tv.tuner.TunerServiceFrontendInfo;
/**
* Tuner Frontend interface handles tuner related operations.
diff --git a/services/tuner/aidl/android/media/tv/tuner/ITunerService.aidl b/services/tuner/aidl/android/media/tv/tuner/ITunerService.aidl
index 5c1bce7..205e222 100644
--- a/services/tuner/aidl/android/media/tv/tuner/ITunerService.aidl
+++ b/services/tuner/aidl/android/media/tv/tuner/ITunerService.aidl
@@ -20,7 +20,7 @@
import android.hardware.common.fmq.SynchronizedReadWrite;
import android.hardware.common.fmq.UnsynchronizedWrite;
import android.media.tv.tuner.ITunerFrontend;
-import android.media.tv.tuner.TunerServiceFrontendInfo;
+import android.media.tv.tuner.TunerFrontendInfo;
/**
* TunerService interface handles tuner related operations.
@@ -43,7 +43,7 @@
* @param frontendHandle the handle of the frontend granted by TRM.
* @return the information of the frontend.
*/
- TunerServiceFrontendInfo getFrontendInfo(in int frontendHandle);
+ TunerFrontendInfo getFrontendInfo(in int frontendHandle);
/**
* Open a Tuner Frontend interface.
diff --git a/services/tuner/aidl/android/media/tv/tuner/TunerServiceFrontendInfo.aidl b/services/tuner/aidl/android/media/tv/tuner/TunerFrontendInfo.aidl
similarity index 89%
rename from services/tuner/aidl/android/media/tv/tuner/TunerServiceFrontendInfo.aidl
rename to services/tuner/aidl/android/media/tv/tuner/TunerFrontendInfo.aidl
index ddcbcdc..4bccd56 100644
--- a/services/tuner/aidl/android/media/tv/tuner/TunerServiceFrontendInfo.aidl
+++ b/services/tuner/aidl/android/media/tv/tuner/TunerFrontendInfo.aidl
@@ -21,13 +21,16 @@
/**
* FrontendInfo interface that carries tuner frontend information.
*
+ * <p>This is used to update the TunerResourceManager and pass Frontend
+ * information from HAL to the client side.
+ *
* {@hide}
*/
-parcelable TunerServiceFrontendInfo {
+parcelable TunerFrontendInfo {
/**
- * Frontend Id
+ * Frontend Handle
*/
- int id;
+ int handle;
/**
* Frontend Type