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

Commit f687c360 authored by Weilin Xu's avatar Weilin Xu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic2e8c5fd3af4c90e7d4c678e32c33484eb06be52
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2bd56b2 800f8fa2

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) {