commit 7633bf9ea6e143794943a3a95f4d6e9b8743b740
author Hongguang Chen <hgchen@google.com> Wed May 10 21:41:23 2023 -0700
committer Hongguang Chen <hgchen@google.com> Wed May 10 21:46:16 2023 -0700
tree abd251440c68d6d18870700fe2c8e8f8f80a1269
parent 682cbf5b034af3f51abe955d8d0d8f49226ea4b9

Return valid value when falling back to openDemux

Fix: 281925603
Test: manual testing
Change-Id: I715f1ed94fcc9992b2b4c393fcb6428672e5ed9d

services/tuner/TunerService.cpp

diff --git a/services/tuner/TunerService.cpp b/services/tuner/TunerService.cpp
index e5bcf1f..9a1e8bb 100644
--- a/services/tuner/TunerService.cpp
+++ b/services/tuner/TunerService.cpp
@@ -100,8 +100,11 @@
 
     if (fallBackToOpenDemux) {
         auto status = mTuner->openDemux(&ids, &demux);
-        return ::ndk::ScopedAStatus::fromServiceSpecificError(
-                static_cast<int32_t>(Result::UNAVAILABLE));
+        if (status.isOk()) {
+            *_aidl_return = ::ndk::SharedRefBase::make<TunerDemux>(demux, ids[0],
+                                                                   this->ref<TunerService>());
+        }
+        return status;
     } else {
         int id = TunerHelper::getResourceIdFromHandle(in_demuxHandle, DEMUX);
         auto status = mTuner->openDemuxById(id, &demux);