Merge "Don't open frontend device if it's a shared frontend" (8212f52f) · Commits · e / os / android_frameworks_base

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -211,6 +211,7 @@ public class Tuner implements AutoCloseable {
		@Nullable
		private FrontendInfo mFrontendInfo;
		private Integer mFrontendHandle;
		private Boolean mIsSharedFrontend = false;
		private int mFrontendType = FrontendSettings.TYPE_UNDEFINED;
		private int mUserId;
		private Lnb mLnb;
		@@ -338,8 +339,11 @@ public class Tuner implements AutoCloseable {
		*/
		public void shareFrontendFromTuner(@NonNull Tuner tuner) {
		mTunerResourceManager.shareFrontend(mClientId, tuner.mClientId);
		synchronized (mIsSharedFrontend) {
		mFrontendHandle = tuner.mFrontendHandle;
		mFrontend = nativeOpenFrontendByHandle(mFrontendHandle);
		mFrontend = tuner.mFrontend;
		mIsSharedFrontend = true;
		}
		}

		/**
		@@ -370,10 +374,15 @@ public class Tuner implements AutoCloseable {

		private void releaseAll() {
		if (mFrontendHandle != null) {
		synchronized (mIsSharedFrontend) {
		if (!mIsSharedFrontend) {
		int res = nativeCloseFrontend(mFrontendHandle);
		if (res != Tuner.RESULT_SUCCESS) {
		TunerUtils.throwExceptionForResult(res, "failed to close frontend");
		}
		}
		mIsSharedFrontend = false;
		}
		mTunerResourceManager.releaseFrontend(mFrontendHandle, mClientId);
		FrameworkStatsLog
		.write(FrameworkStatsLog.TV_TUNER_STATE_CHANGED, mUserId,