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

Commit 6f14345a authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" into sc-dev

parents 34529821 deafc7f6

services/tuner/TunerDescrambler.cpp

+6 −4
Original line number Diff line number Diff line
@@ -67,8 +67,9 @@ Status TunerDescrambler::addPid(const TunerDemuxPid& pid, 
        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));

    }



    Result res = mDescrambler->addPid(getHidlDemuxPid(pid),

            static_cast<TunerFilter*>(optionalSourceFilter.get())->getHalFilter());

    sp<IFilter> halFilter = (optionalSourceFilter == NULL)

            ? NULL : static_cast<TunerFilter*>(optionalSourceFilter.get())->getHalFilter();

    Result res = mDescrambler->addPid(getHidlDemuxPid(pid), halFilter);

    if (res != Result::SUCCESS) {

        return ::ndk::ScopedAStatus::fromServiceSpecificError(static_cast<int32_t>(res));

    }
@@ -82,8 +83,9 @@ Status TunerDescrambler::removePid(const TunerDemuxPid& pid, 
        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));

    }



    Result res = mDescrambler->removePid(getHidlDemuxPid(pid),

            static_cast<TunerFilter*>(optionalSourceFilter.get())->getHalFilter());

    sp<IFilter> halFilter = (optionalSourceFilter == NULL)

            ? NULL : static_cast<TunerFilter*>(optionalSourceFilter.get())->getHalFilter();

    Result res = mDescrambler->removePid(getHidlDemuxPid(pid), halFilter);

    if (res != Result::SUCCESS) {

        return ::ndk::ScopedAStatus::fromServiceSpecificError(static_cast<int32_t>(res));

    }