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

Merge "Correct log format while comparing an existing task for new component"

Browse Source
This commit is contained in:
Jerry Chang
2023-02-04 06:13:13 +00:00
committed by Android (Google) Code Review
parent e40a9a7d5c 2ec1fe8d6f
commit 92e4e15b4a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -385,9 +385,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
}
ProtoLog.d(WM_DEBUG_TASKS, "Comparing existing cls=%s /aff=%s to new cls=%s /aff=%s",
r.getTask().rootAffinity, mIntent.getComponent().flattenToShortString(),
mInfo.taskAffinity, (task.realActivity != null
? task.realActivity.flattenToShortString() : ""));
(task.realActivity != null ? task.realActivity.flattenToShortString() : ""),
task.rootAffinity, mIntent.getComponent().flattenToShortString(),
mTaskAffinity);
// TODO Refactor to remove duplications. Check if logic can be simplified.
if (task.realActivity != null && task.realActivity.compareTo(cls) == 0
&& Objects.equals(documentData, taskDocumentData)) {