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

Commit 428e04bb authored by Mateusz Cicheński's avatar Mateusz Cicheński
Browse files

If leash is null it's not a valid state to remove PiP 

Due to potential race condition if an app crashes during the dismiss
PiP gesture, it is possible that the leash will be reset in
onTaskVanished before the removePip function gets invoked. In such state it's no longer valid to try to dismiss PiP, since it's already gone.

Bug: 269113067
Test: n/a, following bug report stack trace for root cause

Change-Id: I985ee12f54d8fb2ab005197427a522d871692d1a
parent 48e1f12c

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

+3 −3
Original line number Diff line number Diff line
@@ -619,11 +619,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
     * Removes PiP immediately.

     */

    public void removePip() {

        if (!mPipTransitionState.isInPip() || mToken == null) {

        if (!mPipTransitionState.isInPip() || mToken == null || mLeash == null) {

            ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: Not allowed to removePip in current state"

                            + " mState=%d mToken=%s", TAG, mPipTransitionState.getTransitionState(),

                    mToken);

                            + " mState=%d mToken=%s mLeash=%s", TAG,

                    mPipTransitionState.getTransitionState(), mToken, mLeash);

            return;

        }