From 17050539e51c4bfc06710143d4d51d05fd1a2d4c Mon Sep 17 00:00:00 2001
From: Ray Chin <raychin@google.com>
Date: Thu, 2 Feb 2023 17:50:01 +0800
Subject: [PATCH] Refactor releaseAll behavoir for tuner

Bug: 263494704
Test: atest android.media.tv.tuner.cts.TunerTest#testClose on cf_x86_tv-userdebug
Change-Id: Iabab3457f070a36b50e72bb2c79bb23de462b515
---
 media/java/android/media/tv/tuner/Tuner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 7d08b81fd1562..5a569456b4a76 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -805,6 +805,7 @@ public class Tuner implements AutoCloseable  {
         acquireTRMSLock("close()");
         try {
             releaseAll();
+            mTunerResourceManager.unregisterClientProfile(mClientId);
             TunerUtils.throwExceptionForResult(nativeClose(), "failed to close tuner");
         } finally {
             releaseTRMSLock();
@@ -968,7 +969,6 @@ public class Tuner implements AutoCloseable  {
         releaseDescramblers();
         releaseFilters();
         releaseDemux();
-        mTunerResourceManager.unregisterClientProfile(mClientId);
     }
 
     /**