commit 3ac0a3eed2f3eacd17a5d1381e1cc574d96794e0
author Amy Zhang <amyjojo@google.com> Thu Jan 14 18:55:10 2021 -0800
committer Amy Zhang <amyjojo@google.com> Thu Jan 14 18:55:10 2021 -0800
tree ac2a42194e0483eb0a4f5d485ced63bca43e744f
parent d1fd5ac468f2d065b78673bfe94a1f905573670f

Connect LnbClient to TunerLnb interface and handle error messages

Test: make libmedia_tv_tuner
Bug: 159067322
Change-Id: Iaadf431c984bdbf3a59f9bdd073639f4b3dc12bb

media/jni/tuner/TunerClient.cpp

diff --git a/media/jni/tuner/TunerClient.cpp b/media/jni/tuner/TunerClient.cpp
index f5e3524..498ba0e 100644
--- a/media/jni/tuner/TunerClient.cpp
+++ b/media/jni/tuner/TunerClient.cpp
@@ -229,15 +229,15 @@
 sp<LnbClient> TunerClient::openLnb(int lnbHandle) {
     if (mTunerService != NULL) {
         // TODO: handle error code
-        /*shared_ptr<ITunerLnb> tunerLnb;
-        mTunerService->openLnb(demuxHandle, &tunerLnb);
-        return new LnbClient(tunerLnb);*/
+        shared_ptr<ITunerLnb> tunerLnb;
+        mTunerService->openLnb(lnbHandle, &tunerLnb);
+        return new LnbClient(tunerLnb);
     }
 
     if (mTuner != NULL) {
         int id = getResourceIdFromHandle(lnbHandle, LNB);
         // TODO: pending aidl interface
-        sp<LnbClient> lnbClient = new LnbClient();
+        sp<LnbClient> lnbClient = new LnbClient(NULL);
         sp<ILnb> hidlLnb = openHidlLnbById(id);
         if (hidlLnb != NULL) {
             lnbClient->setHidlLnb(hidlLnb);
@@ -252,14 +252,14 @@
 sp<LnbClient> TunerClient::openLnbByName(string lnbName) {
     if (mTunerService != NULL) {
         // TODO: handle error code
-        /*shared_ptr<ITunerLnb> tunerLnb;
+        shared_ptr<ITunerLnb> tunerLnb;
         mTunerService->openLnbByName(lnbName, &tunerLnb);
-        return new LnbClient(tunerLnb);*/
+        return new LnbClient(tunerLnb);
     }
 
     if (mTuner != NULL) {
         // TODO: pending aidl interface
-        sp<LnbClient> lnbClient = new LnbClient();
+        sp<LnbClient> lnbClient = new LnbClient(NULL);
         LnbId id;
         sp<ILnb> hidlLnb = openHidlLnbByName(lnbName, id);
         if (hidlLnb != NULL) {