diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-31 00:29:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-31 00:29:53 +0000 |
| commit | dd7204ab618e0d537dd907e61a85225bebea15a2 (patch) | |
| tree | dfe4aa04a3bfcc34d0176974b26e1e0b6df6d7b7 | |
| parent | 1ee34508c358b3d0a2602ed4bf21c73d124d5c44 (diff) | |
| parent | 7155480d5a08e5a8cb3f96cd25103c1f37057da3 (diff) | |
Merge "Change resource claim to sync to avoid resource conflict" am: f8d7645571 am: 7155480d5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538182
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If829fdf572306852ce0fda685cfb620836f87298
| -rw-r--r-- | media/java/android/media/tv/tuner/Tuner.java | 2 |
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( |