From e6983c1f66ed92bf78be7b40ba2fc88a83111d58 Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Fri, 27 May 2022 17:45:32 +0000
Subject: [PATCH] Allow LNB to be opened before Frontend

Change-Id: If7e82db95dda80a90767d7808b140ebcb175ab97
bug: 233830709
Test: atest TunerTest.java
---
 media/java/android/media/tv/tuner/Tuner.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index e5673a613b59f..13f7ee6e8c8be 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -2163,7 +2163,9 @@ public class Tuner implements AutoCloseable  {
             if (checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB, mLnbLock)
                     && mLnb != null) {
                 mLnb.setCallbackAndOwner(this, executor, cb);
-                setLnb(mLnb);
+                if (mFrontendHandle != null && mFrontend != null) {
+                    setLnb(mLnb);
+                }
                 return mLnb;
             }
             return null;
@@ -2197,7 +2199,9 @@ public class Tuner implements AutoCloseable  {
                 }
                 mLnb = newLnb;
                 mLnb.setCallbackAndOwner(this, executor, cb);
-                setLnb(mLnb);
+                if (mFrontendHandle != null && mFrontend != null) {
+                    setLnb(mLnb);
+                }
             }
             return mLnb;
         } finally {