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 am: 318641ee43

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13625718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a49d3f9ce225863f53a4ba12a8604734eff7d88
This commit is contained in:
Amy Zhang
2021-02-22 20:54:50 +00:00
committed by Automerger Merge Worker
parent 1e3dbbc145 318641ee43
commit 12ef5d619c
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) {
if (TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1,
"unlinkFrontendToCiCam")) {
if (mFrontendCiCamHandle != null && mFrontendCiCamId == ciCamId) {
if (mFrontendCiCamHandle != null && mFrontendCiCamId != null
&& mFrontendCiCamId == ciCamId) {
int result = nativeUnlinkCiCam(ciCamId);
if (result == RESULT_SUCCESS) {
mTunerResourceManager.releaseCiCam(mFrontendCiCamHandle, mClientId);
@@ -1409,6 +1410,7 @@ public class Tuner implements AutoCloseable {
boolean granted = mTunerResourceManager.requestCiCam(request, ciCamHandle);
if (granted) {
mFrontendCiCamHandle = ciCamHandle[0];
mFrontendCiCamId = ciCamId;
}
return granted;
}