From ae927f97230ddc63ac9db6dea912eeaf974bb5d3 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Tue, 10 Nov 2020 11:24:45 -0800
Subject: [PATCH] Null-check on PipMenuController.

For now, TV PiP does not have a menu controller.

Bug: 172909450
Test: None
Change-Id: I0f8a6628607568e71dab795eda255972f00c8b44
---
 .../src/com/android/wm/shell/pip/PipTaskOrganizer.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
index b2f4b55003003..f29b137e84699 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
@@ -495,7 +495,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
             mOnDisplayIdChangeCallback.accept(info.displayId);
         }
 
-        mMenuActivityController.onTaskAppeared();
+        if (mMenuActivityController != null) {
+            mMenuActivityController.onTaskAppeared();
+        }
 
         if (mShouldIgnoreEnteringPipTransition) {
             final Rect destinationBounds = mPipBoundsState.getBounds();
@@ -668,7 +670,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
         mPictureInPictureParams = null;
         mState = State.UNDEFINED;
         mPipUiEventLoggerLogger.setTaskInfo(null);
-        mMenuActivityController.onTaskVanished();
+        if (mMenuActivityController != null) {
+            mMenuActivityController.onTaskVanished();
+        }
     }
 
     @Override