commit 420c0308133f12a65ae81f6a3dfdf0dd36103ec9
author Ray Chin <raychin@google.com> Tue Mar 12 15:46:26 2024 +0800
committer Ray Chin <raychin@google.com> Mon Mar 18 17:49:12 2024 +0800
tree 45c7c2df90a252601737d26b4e555aca7d330e86
parent 5a5b2e680df67054f8df0c8c934a772009028b56

Fix tuner service close HAL twice issue

Bug: 322928583
Test: atest android.media.tv.tuner.cts.TunerTest on cf_x86_tv
Change-Id: I92caa9ca5f93c15131b9a97d0c29194c69fd71a6

services/tuner/TunerDescrambler.cpp

diff --git a/services/tuner/TunerDescrambler.cpp b/services/tuner/TunerDescrambler.cpp
index ffe0be9..c1214bd 100644
--- a/services/tuner/TunerDescrambler.cpp
+++ b/services/tuner/TunerDescrambler.cpp
@@ -41,7 +41,9 @@
 }
 
 TunerDescrambler::~TunerDescrambler() {
-    close();
+    if (!isClosed) {
+        close();
+    }
     mDescrambler = nullptr;
 }
 
@@ -75,6 +77,7 @@
 }
 
 ::ndk::ScopedAStatus TunerDescrambler::close() {
+    isClosed = true;
     return mDescrambler->close();
 }