commit f5cea15ff60d07907b0916ebd5459e5fb144e2ed
author David Zhao <qingxun@google.com> Thu Nov 10 17:12:24 2022 -0800
committer David Zhao <qingxun@google.com> Mon Nov 28 13:28:17 2022 -0800
tree c73a2331627c0c219c892f530ee88712ebeba53a
parent cc7c86255aa48eefa35100a0113457310d38f170

Ensure tuner components close on destruct

Bug: 254234231
Test: Manually on cuttlefish with logging of destruction and closing of
Tuner components
Change-Id: I22f7eefa429b1a9d239c34eb668b156c9d81dc3f

Change-Id: I5dad4ffef4efbbb98660a161c59518a038d7bfaf

services/tuner/TunerDemux.cpp

diff --git a/services/tuner/TunerDemux.cpp b/services/tuner/TunerDemux.cpp
index 7e07da1..92fa970 100644
--- a/services/tuner/TunerDemux.cpp
+++ b/services/tuner/TunerDemux.cpp
@@ -50,6 +50,7 @@
 }
 
 TunerDemux::~TunerDemux() {
+    close();
     mDemux = nullptr;
     mTunerService = nullptr;
 }

services/tuner/TunerDescrambler.cpp

diff --git a/services/tuner/TunerDescrambler.cpp b/services/tuner/TunerDescrambler.cpp
index 8cc5fe0..ffe0be9 100644
--- a/services/tuner/TunerDescrambler.cpp
+++ b/services/tuner/TunerDescrambler.cpp
@@ -41,6 +41,7 @@
 }
 
 TunerDescrambler::~TunerDescrambler() {
+    close();
     mDescrambler = nullptr;
 }
 

services/tuner/TunerDvr.cpp

diff --git a/services/tuner/TunerDvr.cpp b/services/tuner/TunerDvr.cpp
index a0abc92..fcee966 100644
--- a/services/tuner/TunerDvr.cpp
+++ b/services/tuner/TunerDvr.cpp
@@ -37,6 +37,7 @@
 }
 
 TunerDvr::~TunerDvr() {
+    close();
     mDvr = nullptr;
 }
 

services/tuner/TunerFilter.cpp

diff --git a/services/tuner/TunerFilter.cpp b/services/tuner/TunerFilter.cpp
index fd1f886..478e7ea 100644
--- a/services/tuner/TunerFilter.cpp
+++ b/services/tuner/TunerFilter.cpp
@@ -47,8 +47,8 @@
         mTunerService(tuner) {}
 
 TunerFilter::~TunerFilter() {
+    close();
     freeSharedFilterToken("");
-
     {
         Mutex::Autolock _l(mLock);
         mFilter = nullptr;

services/tuner/TunerFrontend.cpp

diff --git a/services/tuner/TunerFrontend.cpp b/services/tuner/TunerFrontend.cpp
index b52a740..1e93d95 100644
--- a/services/tuner/TunerFrontend.cpp
+++ b/services/tuner/TunerFrontend.cpp
@@ -37,6 +37,7 @@
 }
 
 TunerFrontend::~TunerFrontend() {
+    close();
     mFrontend = nullptr;
     mId = -1;
 }

services/tuner/TunerLnb.cpp

diff --git a/services/tuner/TunerLnb.cpp b/services/tuner/TunerLnb.cpp
index 22306e1..2fb6135 100644
--- a/services/tuner/TunerLnb.cpp
+++ b/services/tuner/TunerLnb.cpp
@@ -36,6 +36,7 @@
 }
 
 TunerLnb::~TunerLnb() {
+    close();
     mLnb = nullptr;
     mId = -1;
 }

services/tuner/TunerTimeFilter.cpp

diff --git a/services/tuner/TunerTimeFilter.cpp b/services/tuner/TunerTimeFilter.cpp
index f5094b9..385a063 100644
--- a/services/tuner/TunerTimeFilter.cpp
+++ b/services/tuner/TunerTimeFilter.cpp
@@ -35,6 +35,7 @@
 }
 
 TunerTimeFilter::~TunerTimeFilter() {
+    close();
     mTimeFilter = nullptr;
 }