From e882c08a9f3d87e62f674ef5aa98e3ba40ca29da Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Tue, 1 Dec 2020 15:54:45 -0800
Subject: [PATCH] Change resource claim to sync to avoid resource conflict

bug: 174544018
Test: manual
Change-Id: Ib2688da2a85cdad896f9f2814828ce7659c8a695
---
 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 a9da772302148..c2613716cd073 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -308,6 +308,7 @@ public class Tuner implements AutoCloseable  {
                                 .write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
                                     FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN);
                     }
+                    releaseAll();
                     mHandler.sendMessage(mHandler.obtainMessage(MSG_RESOURCE_LOST));
                 }
             };
@@ -610,7 +611,6 @@ public class Tuner implements AutoCloseable  {
                     break;
                 }
                 case MSG_RESOURCE_LOST: {
-                    releaseAll();
                     if (mOnResourceLostListener != null
                                 && mOnResourceLostListenerExecutor != null) {
                         mOnResourceLostListenerExecutor.execute(