From f196d76588cec82ae523bcdc7cc8e7b21ef5fa32 Mon Sep 17 00:00:00 2001
From: Yixiao Luo <yixiaoluo@google.com>
Date: Fri, 24 Jun 2022 15:22:51 -0700
Subject: [PATCH] Fixed a crash when using TvInteractiveAppView to create a Bi
 app without TvView

cherrypick from pa/2241003

Change-Id: I3e11035cf31adae05fa5bcebf29981440ca3a705
---
 .../media/tv/interactive/TvInteractiveAppManager.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppManager.java b/media/java/android/media/tv/interactive/TvInteractiveAppManager.java
index 88ca30ceb8a6a..c0261f2036045 100755
--- a/media/java/android/media/tv/interactive/TvInteractiveAppManager.java
+++ b/media/java/android/media/tv/interactive/TvInteractiveAppManager.java
@@ -1613,7 +1613,9 @@ public final class TvInteractiveAppManager {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    mSession.getInputSession().requestBroadcastInfo(request);
+                    if (mSession.getInputSession() != null) {
+                        mSession.getInputSession().requestBroadcastInfo(request);
+                    }
                 }
             });
         }
@@ -1622,7 +1624,9 @@ public final class TvInteractiveAppManager {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    mSession.getInputSession().removeBroadcastInfo(requestId);
+                    if (mSession.getInputSession() != null) {
+                        mSession.getInputSession().removeBroadcastInfo(requestId);
+                    }
                 }
             });
         }