Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0dde211d020b360fd9b414356561939429aa65cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-15 00:19:33 +00:00
committed by Automerger Merge Worker
parent 3322b53eb3 e8d0d4fd90
commit 6e5a7ed85d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/tv/tuner/filter/Filter.java
View File

@@ -560,6 +560,11 @@ public class Filter implements AutoCloseable {
*/ */
@Override @Override
public void close() { public void close() {
synchronized (mCallbackLock) {
mCallback = null;
mExecutor = null;
}
synchronized (mLock) { synchronized (mLock) {
if (mIsClosed) { if (mIsClosed) {
return; return;
@@ -568,8 +573,6 @@ public class Filter implements AutoCloseable {
if (res != Tuner.RESULT_SUCCESS) { if (res != Tuner.RESULT_SUCCESS) {
TunerUtils.throwExceptionForResult(res, "Failed to close filter."); TunerUtils.throwExceptionForResult(res, "Failed to close filter.");
} else { } else {
mCallback = null;
mExecutor = null;
mIsStarted = false; mIsStarted = false;
mIsClosed = true; mIsClosed = true;
} }