Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e5905d4 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I393b76e60fc22d129c1fd41dcecd4425cd70bf49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6b95882 c3b917ad

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

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        }

        mPipBoundsState.setBounds(destinationBounds);

        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

            // will be removed when the current transition is finished, so we need to reparent it

            // to the actual Task surface now.