Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13a11f78 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Only check frontend resources availability when cicam resource is... 

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

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

            }

        }