From 11c15fa95131b8f8f6aadcdd0beaa9e626d190d1 Mon Sep 17 00:00:00 2001
From: Kensuke Miyagi <kemiyagi@google.com>
Date: Fri, 5 Nov 2021 20:42:24 -0700
Subject: [PATCH] Do not call TunerResourceManager#releaseFrontend for sharees

Bug: 205360717
Test: android.media.tv.tuner.cts.TunerTest
Change-Id: I514d54de38bc03defe724d72db8af7fb2f1c651f
---
 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 c666255c749a3..73a821e09f20c 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -510,10 +510,10 @@ public class Tuner implements AutoCloseable  {
                     if (res != Tuner.RESULT_SUCCESS) {
                         TunerUtils.throwExceptionForResult(res, "failed to close frontend");
                     }
+                    mTunerResourceManager.releaseFrontend(mFrontendHandle, mClientId);
                 }
                 mIsSharedFrontend = false;
             }
-            mTunerResourceManager.releaseFrontend(mFrontendHandle, mClientId);
             FrameworkStatsLog
                     .write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
                     FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN);