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

Merge "Assign cicamId to local mFrontendCicamId when ciCam resource is granted" into sc-dev

Browse Source
This commit is contained in:
Amy Zhang
2021-02-22 18:55:42 +00:00
committed by Android (Google) Code Review
parent baf2fe34a3 c189c59d65
commit 318641ee43
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -978,7 +978,8 @@ public class Tuner implements AutoCloseable {
public int disconnectFrontendToCiCam(int ciCamId) { public int disconnectFrontendToCiCam(int ciCamId) {
if (TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1, if (TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1,
"unlinkFrontendToCiCam")) { "unlinkFrontendToCiCam")) {
if (mFrontendCiCamHandle != null && mFrontendCiCamId == ciCamId) { if (mFrontendCiCamHandle != null && mFrontendCiCamId != null
&& mFrontendCiCamId == ciCamId) {
int result = nativeUnlinkCiCam(ciCamId); int result = nativeUnlinkCiCam(ciCamId);
if (result == RESULT_SUCCESS) { if (result == RESULT_SUCCESS) {
mTunerResourceManager.releaseCiCam(mFrontendCiCamHandle, mClientId); mTunerResourceManager.releaseCiCam(mFrontendCiCamHandle, mClientId);
@@ -1409,6 +1410,7 @@ public class Tuner implements AutoCloseable {
boolean granted = mTunerResourceManager.requestCiCam(request, ciCamHandle); boolean granted = mTunerResourceManager.requestCiCam(request, ciCamHandle);
if (granted) { if (granted) {
mFrontendCiCamHandle = ciCamHandle[0]; mFrontendCiCamHandle = ciCamHandle[0];
mFrontendCiCamId = ciCamId;
} }
return granted; return granted;
} }