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

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

Merge "Initialize launchCookie in fillTaskInfo."

parents ce6238e0 2e4f47dc

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

+1 −0
Original line number Diff line number Diff line
@@ -4093,6 +4093,7 @@ class Task extends WindowContainer<WindowContainer> { 
        info.topActivityInfo = mReuseActivitiesReport.top != null

                ? mReuseActivitiesReport.top.info

                : null;

        info.launchCookies.clear();

        info.addLaunchCookie(mLaunchCookie);

        forAllActivities(r -> {

            info.addLaunchCookie(r.mLaunchCookie);

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

+1 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { 
            changed = (cfgChanges & REPORT_CONFIGS) != 0;

        }

        if (!(changed || force)) {

            // mTmpTaskInfo will be reused next time.

            return;

        }

        final RunningTaskInfo newInfo = mTmpTaskInfo;