diff options
| author | Henry Fang <quxiangfang@google.com> | 2020-12-11 10:26:11 -0800 |
|---|---|---|
| committer | Henry Fang <quxiangfang@google.com> | 2020-12-30 18:56:58 +0000 |
| commit | 3d9490c218578ca3c6c4e03cf047cb37e62adca2 (patch) | |
| tree | c32620e5c190d9903ff351a446acd62b01b4c98b /media | |
| parent | ba032abd1a25f160d7211a0db0b99623a2b2adfc (diff) | |
Don't open frontend device if it's a shared frontend
bug: 175255961
Test: manual
Change-Id: Ib8c9704ebd1c518a84b8526172ca2fe3d087db87
Merged-In: Ib8c9704ebd1c518a84b8526172ca2fe3d087db87
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/tv/tuner/Tuner.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index e148d0e29b5a..3174477c418a 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -210,6 +210,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; @@ -336,8 +337,11 @@ public class Tuner implements AutoCloseable { */ public void shareFrontendFromTuner(@NonNull Tuner tuner) { mTunerResourceManager.shareFrontend(mClientId, tuner.mClientId); - mFrontendHandle = tuner.mFrontendHandle; - mFrontend = nativeOpenFrontendByHandle(mFrontendHandle); + synchronized (mIsSharedFrontend) { + mFrontendHandle = tuner.mFrontendHandle; + mFrontend = tuner.mFrontend; + mIsSharedFrontend = true; + } } /** @@ -368,14 +372,19 @@ public class Tuner implements AutoCloseable { private void releaseAll() { if (mFrontendHandle != null) { - int res = nativeCloseFrontend(mFrontendHandle); - if (res != Tuner.RESULT_SUCCESS) { - TunerUtils.throwExceptionForResult(res, "failed to close frontend"); + 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, - FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN); + FrameworkStatsLog.TV_TUNER_STATE_CHANGED__STATE__UNKNOWN); mFrontendHandle = null; mFrontend = null; } |