diff options
| author | 2020-04-13 09:14:23 +0200 | |
|---|---|---|
| committer | 2020-04-13 09:14:30 +0200 | |
| commit | fe0723ff6a987f99da5f7d28b5f68cfe532b1297 (patch) | |
| tree | 36da2e7df6e4e40a0a16d0aeccf588a514148861 | |
| parent | ec38d551e392fc1825bbaab527890095aebf2f66 (diff) | |
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
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java | 8 |
1 files 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 bab1f39d63e0..3a2d786cebe4 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); + } } /** |