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

Commit 92e4e15b authored by Jerry Chang's avatar Jerry Chang Committed by Android (Google) Code Review
Browse files

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

parents e40a9a7d 2ec1fe8d

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

+3 −3
Original line number Diff line number Diff line
@@ -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)) {