Merge "Fix Filter callback race condition" into tm-dev

2022-04-14 23:58:16 +00:00
parent 16d2613662 d8a124b758
commit e8d0d4fd90
1 changed files with 5 additions and 2 deletions
--- a/media/java/android/media/tv/tuner/filter/Filter.java
+++ b/media/java/android/media/tv/tuner/filter/Filter.java
@@ -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;
            }