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

Commit 83f04c01 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Check for null mLeash before setting alpha." into tm-dev am: 1f9afd72 am: b2cd9af9 

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



Change-Id: I424d59ee7348654fef4884cb8b481cd84095ca1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 475683bc b2cd9af9

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

+5 −0
Original line number Diff line number Diff line
@@ -979,6 +979,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        if (!isInPip()) {

            return;

        }

        if (mLeash == null || !mLeash.isValid()) {

            ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: Invalid leash on setPipVisibility: %s", TAG, mLeash);

            return;

        }

        final SurfaceControl.Transaction tx =

                mSurfaceControlTransactionFactory.getTransaction();

        mSurfaceTransactionHelper.alpha(tx, mLeash, visible ? 1f : 0f);