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

Commit 9550f1c9 authored by wilsonshih's avatar wilsonshih
Browse files

Always add cookie for each activity when fill TaskInfo. 

The LaunchCookie is a token for activity starter to find out where the
activity was start, so it should be allowed to add in TaskInfo even
when the activity is finishing.

Bug: 241070422
Test: Launch an activity which will request finish when receive back
key from Launcher, e.g. calendar widget. Verify
QuickstepTransitionManager can find the LauncherView so it can play
closing to home animation.
Test: atest ActivityRecordTests#testTransferLaunchCookieWhenFinishing

Change-Id: I0351eb76e9a97b718b490d6151b5434f8ef8a42c
parent e4b7302a

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,