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

Move close callback outside ProgramList lock

Browse Source 
The callback of on-close listener in program list was moved outside
of the lock in porgram list to avoid the deadlock between
program list and tuner adpater.

Bug: 254505565
Test: atest android.radio.cts.RadioTunerTest
Change-Id: I9c668c63a578ba04b52747e0ef96e9e67cc00b72
This commit is contained in:
Weilin Xu
2022-10-19 20:04:43 +00:00
parent 2d1f437194
commit 1fcf05bbfc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/radio/ProgramList.java
View File

@@ -160,6 +160,7 @@ public final class ProgramList implements AutoCloseable {
* Disables list updates and releases all resources. * Disables list updates and releases all resources.
*/ */
public void close() { public void close() {
OnCloseListener onCompleteListenersCopied = null;
synchronized (mLock) { synchronized (mLock) {
if (mIsClosed) return; if (mIsClosed) return;
mIsClosed = true; mIsClosed = true;
@@ -167,10 +168,14 @@ public final class ProgramList implements AutoCloseable {
mListCallbacks.clear(); mListCallbacks.clear();
mOnCompleteListeners.clear(); mOnCompleteListeners.clear();
if (mOnCloseListener != null) { if (mOnCloseListener != null) {
mOnCloseListener.onClose(); onCompleteListenersCopied = mOnCloseListener;
mOnCloseListener = null; mOnCloseListener = null;
} }
} }
if (onCompleteListenersCopied != null) {
onCompleteListenersCopied.onClose();
}
} }
void apply(Chunk chunk) { void apply(Chunk chunk) {