Merge "Fix filter close Executor leakage issue" (8125937c) · Commits · e / os / android_frameworks_base

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -283,9 +283,21 @@ public class Filter implements AutoCloseable {
		synchronized (mCallbackLock) {
		if (mCallback != null) {
		mCallback.onFilterEvent(this, events);
		} else {
		for (FilterEvent event : events) {
		if (event instanceof MediaEvent) {
		((MediaEvent)event).release();
		}
		}
		}
		}
		});
		} else {
		for (FilterEvent event : events) {
		if (event instanceof MediaEvent) {
		((MediaEvent)event).release();
		}
		}
		}
		}
		}
		@@ -558,6 +570,8 @@ 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;
		}