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

Merge "Move close callback outside ProgramList lock" into tm-qpr-dev am: 800f8fa21d

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

Change-Id: Ic2e8c5fd3af4c90e7d4c678e32c33484eb06be52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Weilin Xu
2022-10-27 18:24:02 +00:00
committed by Automerger Merge Worker
parent c2bd56b2a4 800f8fa21d
commit f687c3608e
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) {