From fe0723ff6a987f99da5f7d28b5f68cfe532b1297 Mon Sep 17 00:00:00 2001
From: Sergey Nikolaienkov <sergeynv@google.com>
Date: Mon, 13 Apr 2020 09:14:23 +0200
Subject: [PATCH] Fix expanding PiP on TV

When expanding PiP call PipTaskOrganizer.dismissPip() instead of
PipTaskOrganizer.scheduleAnimateResizePip() directly passing null
destination rect (which is causing a crash, while the dismissPip()
retrieves previously saved initial window's bounds and resizes back to
them).

Bug: 153776392
Bug: 153050065
Test: manual
Change-Id: Ieb9eacb3974b586f93732de35beb7edd9833db03
---
 .../src/com/android/systemui/pip/tv/PipManager.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
index bab1f39d63e05..3a2d786cebe4d 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -462,8 +462,12 @@ public class PipManager implements BasePipManager, PipTaskOrganizer.PipTransitio
                 mCurrentPipBounds = mPipBounds;
                 break;
         }
-        mPipTaskOrganizer.scheduleAnimateResizePip(mCurrentPipBounds, mResizeAnimationDuration,
-                null);
+        if (mCurrentPipBounds != null) {
+            mPipTaskOrganizer.scheduleAnimateResizePip(mCurrentPipBounds, mResizeAnimationDuration,
+                    null);
+        } else {
+            mPipTaskOrganizer.dismissPip(mResizeAnimationDuration);
+        }
     }
 
     /**