Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null-check before reparenting content overlay" into tm-dev

Browse Source
This commit is contained in:
Hongwei Wang
2022-05-18 16:41:37 +00:00
committed by Android (Google) Code Review
parent fd304f2fbb 8a1d54f27e
commit c3b917ad97
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
View File

@@ -363,7 +363,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
} }
mPipBoundsState.setBounds(destinationBounds); mPipBoundsState.setBounds(destinationBounds);
mSwipePipToHomeOverlay = overlay; mSwipePipToHomeOverlay = overlay;
if (ENABLE_SHELL_TRANSITIONS) { if (ENABLE_SHELL_TRANSITIONS && overlay != null) {
// With Shell transition, the overlay was attached to the remote transition leash, which // With Shell transition, the overlay was attached to the remote transition leash, which
// will be removed when the current transition is finished, so we need to reparent it // will be removed when the current transition is finished, so we need to reparent it
// to the actual Task surface now. // to the actual Task surface now.