summaryrefslogtreecommitdiff
path: root/media/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-30 23:16:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-12-30 23:16:54 +0000
commitf8d764557157383ea93bf22d55d3329e8a5f4649 (patch)
tree6e291e1c898f79a191aefd103cf3c1fe17ea641e /media/java
parentd7275581e1ac71801fea37174e96eadac22c0744 (diff)
parent0dbb7105563e15c4d9885b621ba3923f12624e92 (diff)
Merge "Change resource claim to sync to avoid resource conflict"
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/tv/tuner/Tuner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 72b992252e24..8f991126ce3c 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -241,6 +241,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));
}
};
@@ -511,7 +512,6 @@ public class Tuner implements AutoCloseable {
break;
}
case MSG_RESOURCE_LOST: {
- releaseAll();
if (mOnResourceLostListener != null
&& mOnResourceLostListenerExecutor != null) {
mOnResourceLostListenerExecutor.execute(