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 am: c3b917ad97

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439341

Change-Id: I393b76e60fc22d129c1fd41dcecd4425cd70bf49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-05-18 22:31:33 +00:00
committed by Automerger Merge Worker
parent c6b95882ff c3b917ad97
commit 4e5905d45a
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.