Merge "Fix expanding PiP on TV" into rvc-dev am: 0401eb71f5

Change-Id: Ifffdb6e121973b06425fc51f6bbece5955d7c79a
2020-04-13 10:05:42 +00:00
parent 3c8574c81a 0401eb71f5
commit 4f574d017e
1 changed files with 6 additions and 2 deletions
--- 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);
+        }
    }

    /**