Merge "Fix Filter callback race condition" into tm-dev am: e8d0d4fd90 am: 6e5a7ed85d

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

Change-Id: I18776d517ea310479f212223df37fd7e93befca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
             }