Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b1ace8 authored by Weilin Xu's avatar Weilin Xu Committed by Android (Google) Code Review
Browse files

Merge "Move close callback outside ProgramList lock"

parents 84abed9b 1fcf05bb

core/java/android/hardware/radio/ProgramList.java

+6 −1
Original line number Diff line number Diff line
@@ -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) {