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

Merge "Only check frontend resources availability when cicam resource is available in connectFrontendToCiCam impl" into sc-dev

Browse Source
This commit is contained in:
Amy Zhang
2021-02-23 00:28:41 +00:00
committed by Android (Google) Code Review
parent 3d187a3ff5 3ddd9458ed
commit 13a11f7848
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -932,8 +932,8 @@ public class Tuner implements AutoCloseable {
public int connectFrontendToCiCam(int ciCamId) {
if (TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1,
"linkFrontendToCiCam")) {
if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND)
&& checkCiCamResource(ciCamId)) {
if (checkCiCamResource(ciCamId)
&& checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND)) {
return nativeLinkCiCam(ciCamId);
}
}