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

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

Change-Id: I424d59ee7348654fef4884cb8b481cd84095ca1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mateusz Cicheński
2022-05-25 17:29:44 +00:00
committed by Automerger Merge Worker

View File

@@ -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);