From 6d8a195656b0277866e176e8b6143b63d15324b6 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 21 May 2020 11:27:28 -0700
Subject: [PATCH] Fix crash in pip task org from null params

Bug: 156314330
Test: atest PinnedStackTests
Change-Id: I8094c7e29552327f1dd69b4a54c9979d36e57c8b
---
 .../SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
index 72d76b9a4e8b6..c2f8cb9800d0b 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
@@ -426,7 +426,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
     public void onTaskInfoChanged(ActivityManager.RunningTaskInfo info) {
         Objects.requireNonNull(mToken, "onTaskInfoChanged requires valid existing mToken");
         final PictureInPictureParams newParams = info.pictureInPictureParams;
-        if (!applyPictureInPictureParams(newParams)) {
+        if (newParams == null || !applyPictureInPictureParams(newParams)) {
             Log.d(TAG, "Ignored onTaskInfoChanged with PiP param: " + newParams);
             return;
         }