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

Commit 14a60e8a authored Feb 11, 2021 by Amy Zhang

Complete TunerTimeFilter implementation

This CL also set all the successfully closed instance to null
to avoid duplicate closing on the same instance.

Test: make
Bug: 159067322
Bug: 176190508
Change-Id: Idf445641b47f4d8ab4230f30cf6ea3abd4226cbc

parent f543afb2

services/tuner/TunerDemux.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,8 @@ Status TunerDemux::close() {
		}

		Result res = mDemux->close();
		mDemux = NULL;

		if (res != Result::SUCCESS) {
		return Status::fromServiceSpecificError(static_cast<int32_t>(res));
		}

services/tuner/TunerDescrambler.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,8 @@ Status TunerDescrambler::close() {
		}

		Result res = mDescrambler->close();
		mDescrambler = NULL;

		if (res != Result::SUCCESS) {
		return Status::fromServiceSpecificError(static_cast<int32_t>(res));
		}

services/tuner/TunerDvr.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,8 @@ Status TunerDvr::close() {
		}

		Result res = mDvr->close();
		mDvr = NULL;

		if (res != Result::SUCCESS) {
		return ::ndk::ScopedAStatus::fromServiceSpecificError(static_cast<int32_t>(res));
		}

services/tuner/TunerFilter.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -541,6 +541,9 @@ Status TunerFilter::close() {
		return Status::fromServiceSpecificError(static_cast<int32_t>(Result::UNAVAILABLE));
		}
		Result res = mFilter->close();
		mFilter = NULL;
		mFilter_1_1 = NULL;

		if (res != Result::SUCCESS) {
		return Status::fromServiceSpecificError(static_cast<int32_t>(res));
		}

services/tuner/TunerFrontend.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -278,12 +278,14 @@ Status TunerFrontend::close() {
		}

		Result status = mFrontend->close();
		if (status == Result::SUCCESS) {
		return Status::ok();
		}
		mFrontend = NULL;
		mFrontend_1_1 = NULL;

		if (status != Result::SUCCESS) {
		return Status::fromServiceSpecificError(static_cast<int32_t>(status));
		}
		return Status::ok();
		}

		Status TunerFrontend::getStatus(const vector<int32_t>& statusTypes,
		vector<TunerFrontendStatus>* _aidl_return) {