Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change resource claim to sync to avoid resource conflict" am: f8d7645571

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb184d9db19a52f1e9fffee93293be8ec9f7df7b
This commit is contained in:
Treehugger Robot
2020-12-30 23:58:09 +00:00
committed by Automerger Merge Worker
parent 6a62906e48 f8d7645571
commit 7155480d5a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -241,6 +241,7 @@ public class Tuner implements AutoCloseable {
.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId, .write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,
FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN); FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN);
} }
releaseAll();
mHandler.sendMessage(mHandler.obtainMessage(MSG_RESOURCE_LOST)); mHandler.sendMessage(mHandler.obtainMessage(MSG_RESOURCE_LOST));
} }
}; };
@@ -511,7 +512,6 @@ public class Tuner implements AutoCloseable {
break; break;
} }
case MSG_RESOURCE_LOST: { case MSG_RESOURCE_LOST: {
releaseAll();
if (mOnResourceLostListener != null if (mOnResourceLostListener != null
&& mOnResourceLostListenerExecutor != null) { && mOnResourceLostListenerExecutor != null) {
mOnResourceLostListenerExecutor.execute( mOnResourceLostListenerExecutor.execute(