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

Commit 9bd78bdf authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Clear TaskInfo#capturedLink when filling task info" into main

parents 93b2701f d8609926

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

+2 −0
Original line number Diff line number Diff line
@@ -2901,6 +2901,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
        ActivityRecord fillAndReturnTop(Task task, TaskInfo info) {

            info.numActivities = 0;

            info.baseActivity = null;

            info.capturedLink = null;

            info.capturedLinkTimestamp = 0;

            mInfo = info;

            task.forAllActivities(this);

            final ActivityRecord top = mTopRunning;

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

+3 −0
Original line number Diff line number Diff line
@@ -3513,6 +3513,9 @@ class Task extends TaskFragment { 
        if (task.effectiveUid != baseActivityUid) {

            info.baseActivity = new ComponentName("", "");

        }



        info.capturedLink = null;

        info.capturedLinkTimestamp = 0;

    }



    @Nullable PictureInPictureParams getPictureInPictureParams() {