Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Initialize launchCookie in fillTaskInfo."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-15 02:31:53 +00:00
committed by Android (Google) Code Review
parent ce6238e031 2e4f47dc28
commit 849692f86d
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/Task.java
View File

@@ -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);

1
services/core/java/com/android/server/wm/TaskOrganizerController.java
View File

@@ -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;