commit 38261c3406ba471195ff79be6bb28dde0a753ec6
author Amy Zhang <amyjojo@google.com> Wed Feb 03 20:38:52 2021 -0800
committer Amy Zhang <amyjojo@google.com> Fri Feb 05 12:15:22 2021 -0800
tree 5f3ad1e1d02dfe995164751bea53a42abc58494a
parent 2d16f0aac2a16bde5bee0e342d131ffec2efe07e

Connect TunerDescrambler and DescramblerClient

Test: make
Bug: 174095851
Change-Id: I039f92cf6135ae7b0f67d6cd97fe0d95edef26be

media/jni/tuner/TunerClient.cpp

diff --git a/media/jni/tuner/TunerClient.cpp b/media/jni/tuner/TunerClient.cpp
index a604490d..240b144 100644
--- a/media/jni/tuner/TunerClient.cpp
+++ b/media/jni/tuner/TunerClient.cpp
@@ -224,17 +224,18 @@
     return NULL;
 }
 
-sp<DescramblerClient> TunerClient::openDescrambler(int /*descramblerHandle*/) {
+sp<DescramblerClient> TunerClient::openDescrambler(int descramblerHandle) {
     if (mTunerService != NULL) {
-        // TODO: handle error code
-        /*shared_ptr<ITunerDescrambler> tunerDescrambler;
-        mTunerService->openDescrambler(demuxHandle, &tunerDescrambler);
-        return new DescramblerClient(tunerDescrambler);*/
+        shared_ptr<ITunerDescrambler> tunerDescrambler;
+        Status s = mTunerService->openDescrambler(descramblerHandle, &tunerDescrambler);
+        if (ClientHelper::getServiceSpecificErrorCode(s) != Result::SUCCESS) {
+            return NULL;
+        }
+        return new DescramblerClient(tunerDescrambler);
     }
 
     if (mTuner != NULL) {
-        // TODO: pending aidl interface
-        sp<DescramblerClient> descramblerClient = new DescramblerClient();
+        sp<DescramblerClient> descramblerClient = new DescramblerClient(NULL);
         sp<IDescrambler> hidlDescrambler = openHidlDescrambler();
         if (hidlDescrambler != NULL) {
             descramblerClient->setHidlDescrambler(hidlDescrambler);