commit 1d28bbb5a5cfb9b77fe6e4f6fba4453ddae7c01a
author Amy Zhang <amyjojo@google.com> Wed Jan 13 18:11:15 2021 -0800
committer Amy Zhang <amyjojo@google.com> Thu Jan 14 13:34:43 2021 -0800
tree 19a8b068b3d314b0fb5e52e3e4f5c7e76d8b3ba8
parent d61491e8a4483c687571f59970d93b55420fa684

Use TunerFrontendInfo for both TRM and TunerService

Test: make
Bug: 172079283
Change-Id: I10a614ff8b83ad7227cea7285e87b7206eafae0d

services/tuner/TunerService.cpp

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,