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

Commit 8282e352 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Filter callback race condition" into tm-dev am: e8d0d4fd 

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



Change-Id: Id959bd650d871622329e408286ecf726936c0d5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dbe3989b e8d0d4fd

media/java/android/media/tv/tuner/filter/Filter.java

+5 −2
Original line number Diff line number Diff line
@@ -560,6 +560,11 @@ public class Filter implements AutoCloseable { 
     */

    @Override

    public void close() {

        synchronized (mCallbackLock) {

            mCallback = null;

            mExecutor = null;

        }



        synchronized (mLock) {

            if (mIsClosed) {

                return;
@@ -568,8 +573,6 @@ public class Filter implements AutoCloseable { 
            if (res != Tuner.RESULT_SUCCESS) {

                TunerUtils.throwExceptionForResult(res, "Failed to close filter.");

            } else {

                mCallback = null;

                mExecutor = null;

                mIsStarted = false;

                mIsClosed = true;

            }