Merge "Null-check on PipMenuController."

1 files 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 0bd74e39bb5e..a095fb525d24 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
@@ -501,7 +501,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();
@@ -672,7 +674,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
         mPictureInPictureParams = null;
         mState = State.UNDEFINED;
         mPipUiEventLoggerLogger.setTaskInfo(null);
-        mMenuActivityController.onTaskVanished();
+        if (mMenuActivityController != null) {
+            mMenuActivityController.onTaskVanished();
+        }
     }
 
     @Override