Merge "Move close callback outside ProgramList lock"

2022-10-20 23:32:29 +00:00
parent 84abed9b70 1fcf05bbfc
commit 48b1ace87d
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/hardware/radio/ProgramList.java
+++ b/core/java/android/hardware/radio/ProgramList.java
@@ -160,6 +160,7 @@ public final class ProgramList implements AutoCloseable {
     * Disables list updates and releases all resources.
     */
    public void close() {
+        OnCloseListener onCompleteListenersCopied = null;
        synchronized (mLock) {
            if (mIsClosed) return;
            mIsClosed = true;
@@ -167,10 +168,14 @@ public final class ProgramList implements AutoCloseable {
            mListCallbacks.clear();
            mOnCompleteListeners.clear();
            if (mOnCloseListener != null) {
-                mOnCloseListener.onClose();
+                onCompleteListenersCopied = mOnCloseListener;
                mOnCloseListener = null;
            }
        }
+
+        if (onCompleteListenersCopied != null) {
+            onCompleteListenersCopied.onClose();
+        }
    }

    void apply(Chunk chunk) {