Merge "Release resource before send MSG_RESOURCE_LOST message to TIS" (8a062c0c) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/tuner/Tuner.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -362,6 +362,11 @@ public class Tuner implements AutoCloseable {
		*/
		@Override
		public void close() {
		releaseAll();
		TunerUtils.throwExceptionForResult(nativeClose(), "failed to close tuner");
		}

		private void releaseAll() {
		if (mFrontendHandle != null) {
		int res = nativeCloseFrontend(mFrontendHandle);
		if (res != Tuner.RESULT_SUCCESS) {
		@@ -396,9 +401,9 @@ public class Tuner implements AutoCloseable {
		TunerUtils.throwExceptionForResult(res, "failed to close demux");
		}
		mTunerResourceManager.releaseDemux(mDemuxHandle, mClientId);
		mFrontendHandle = null;
		mDemuxHandle = null;
		}
		TunerUtils.throwExceptionForResult(nativeClose(), "failed to close tuner");

		}

		/**
		@@ -495,6 +500,7 @@ public class Tuner implements AutoCloseable {
		break;
		}
		case MSG_RESOURCE_LOST: {
		releaseAll();
		if (mOnResourceLostListener != null
		&& mOnResourceLostListenerExecutor != null) {
		mOnResourceLostListenerExecutor.execute(