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

Commit 615efcaa authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Always add cookie for each activity when fill TaskInfo." into tm-qpr-dev am: d5d92765 

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



Change-Id: I91b1c6634cfcde6077644a93abce9804930f165e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cd96b29 d5d92765

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

+3 −3
Original line number Diff line number Diff line
@@ -2652,12 +2652,12 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 


        @Override

        public void accept(ActivityRecord r) {

            if (r.finishing) {

                return;

            }

            if (r.mLaunchCookie != null) {

                mInfo.addLaunchCookie(r.mLaunchCookie);

            }

            if (r.finishing) {

                return;

            }

            mInfo.numActivities++;

            mInfo.baseActivity = r.mActivityComponent;

            if (mTopRunning == null) {

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+2 −0
Original line number Diff line number Diff line
@@ -2314,6 +2314,8 @@ public class ActivityRecordTests extends WindowTestsBase { 


        assertEquals(launchCookie, activity2.mLaunchCookie);

        assertNull(activity1.mLaunchCookie);

        activity2.makeFinishingLocked();

        assertTrue(activity1.getTask().getTaskInfo().launchCookies.contains(launchCookie));

    }



    private void verifyProcessInfoUpdate(ActivityRecord activity, State state,