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

Commit c0ef54bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid calling getTopMostTask() twice in Task#fillTaskInfo()"

parents 654d1ef5 41b8b1fa

services/core/java/com/android/server/wm/Task.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -4125,7 +4125,7 @@ class Task extends WindowContainer<WindowContainer> { 
        info.positionInParent = getRelativePosition();

        info.positionInParent = getRelativePosition();

        info.parentBounds = getParentBounds();

        info.parentBounds = getParentBounds();





        info.pictureInPictureParams = getPictureInPictureParams();

        info.pictureInPictureParams = getPictureInPictureParams(top);

        info.topActivityInfo = mReuseActivitiesReport.top != null

        info.topActivityInfo = mReuseActivitiesReport.top != null

                ? mReuseActivitiesReport.top.info

                ? mReuseActivitiesReport.top.info

                : null;

                : null;
@@ -4142,7 +4142,10 @@ class Task extends WindowContainer<WindowContainer> { 
    }

    }





    @Nullable PictureInPictureParams getPictureInPictureParams() {

    @Nullable PictureInPictureParams getPictureInPictureParams() {

        final Task top = getTopMostTask();

        return getPictureInPictureParams(getTopMostTask());

    }



    private @Nullable PictureInPictureParams getPictureInPictureParams(Task top) {

        if (top == null) return null;

        if (top == null) return null;

        final ActivityRecord rootActivity = top.getRootActivity();

        final ActivityRecord rootActivity = top.getRootActivity();

        return (rootActivity == null || rootActivity.pictureInPictureArgs.empty())

        return (rootActivity == null || rootActivity.pictureInPictureArgs.empty())