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

Commit 70bbad36 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: 05edfc28 

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



Change-Id: I1335e53a7c8702b3fb181a3609858e2e240ded99
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f025f96e 05edfc28

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

+5 −0
Original line number Diff line number Diff line
@@ -970,6 +970,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);