Merge "Fix expanding PiP on TV" into rvc-dev am: 0401eb71f5 am: 4f574d017e am: 77175aaad3 am: 3fb887f4bc

Change-Id: I8d6f605f8b616c84ff7aa31cddfcbf600cefaf3d
2020-04-13 10:56:09 +00:00
parent 47bf299e93 3fb887f4bc
commit 04f7525f06
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);
+        }
    }

    /**