Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a70dcb93 authored by Hongguang Chen's avatar Hongguang Chen Committed by Automerger Merge Worker
Browse files

Return valid value when falling back to openDemux am: 7633bf9e am: 9ab8a3d3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23149633



Change-Id: I504f3a50b36918f7efee89c817ec4fa7dd3b5a4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1bbd212 9ab8a3d3

services/tuner/TunerService.cpp

+5 −2
Original line number Diff line number Diff line
@@ -100,8 +100,11 @@ binder_status_t TunerService::instantiate() { 


    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);