From 3ddd9458ed8f95dad5c71c647624136b85f380c6 Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Mon, 22 Feb 2021 13:01:18 -0800
Subject: [PATCH] Only check frontend resources availability when cicam
 resource is available in connectFrontendToCiCam impl

This is to avoid granting a new frontend resource to a failed cicam connection

Test: atest android.media.tv.tuner.cts
Bug: 158818696
Change-Id: Ie31ae2dfe86956bf98416add39fa3acae4388f92
---
 media/java/android/media/tv/tuner/Tuner.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index ee0be010c233c..6c2f64ca30a8c 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -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);
             }
         }