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

Commit 3d21ed3b authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Validate content overlay before removal" into tm-dev am: eb700c00 am:... 

Merge "Validate content overlay before removal" into tm-dev am: eb700c00 am: 8cd0c550 am: f7a00887

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



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

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

+5 −0
Original line number Diff line number Diff line
@@ -1604,6 +1604,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            // Avoid double removal, which is fatal.

            return;

        }

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

            ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: trying to remove invalid content overlay (%s)", TAG, surface);

            return;

        }

        final SurfaceControl.Transaction tx = mSurfaceControlTransactionFactory.getTransaction();

        tx.remove(surface);

        tx.apply();