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

Commit 4f5b74bc authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev am: 29668d51 am: c5b8f368 

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



Change-Id: I9a2721fa5b489f582e427e5863387e4e089e127a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 005ae4f4 c5b8f368

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1146,7 +1146,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    public void setPipVisibility(boolean visible) {

    public void setPipVisibility(boolean visible) {

        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

        ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                "setPipVisibility: %s, state=%s visible=%s",

                "setPipVisibility: %s, state=%s visible=%s",

                mTaskInfo.topActivity, mPipTransitionState, visible);

                (mTaskInfo != null ? mTaskInfo.topActivity : null), mPipTransitionState, visible);

        if (!isInPip()) {

        if (!isInPip()) {

            return;

            return;

        }

        }