commit c03d4659733145dd256e3f4a69f20c0156d21969
author Leon Scroggins III <scroggo@google.com> Thu Jan 05 13:03:53 2023 -0500
committer Leon Scroggins III <scroggo@google.com> Thu Jan 12 16:21:17 2023 -0500
tree 5a0253da32463f10279916d118854a0f3db9e0e2
parent 7d089caad4b61600d0d876d18b13f0fb1d255685

Name the ScreenCaptureOutput

Set a name for ScreenCaptureOutput based on whether it's used for region
sampling or not and include the display's id if present.

In Output's mNamePlusId, drop " (NA)" for those without a display id.
This would be extraneous on the ScreenCaptureOutput, which will mark the
display for which it's being used.

Bug: 262706813
Test: look at traces

Change-Id: If447795f3580601434cbcb6493f5fb7c3fa734c9

services/surfaceflinger/CompositionEngine/src/Output.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index d513731..d27add9 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -118,8 +118,9 @@
 void Output::setName(const std::string& name) {
     mName = name;
     auto displayIdOpt = getDisplayId();
-    mNamePlusId = base::StringPrintf("%s (%s)", mName.c_str(),
-                                     displayIdOpt ? to_string(*displayIdOpt).c_str() : "NA");
+    mNamePlusId = displayIdOpt ? base::StringPrintf("%s (%s)", mName.c_str(),
+                                     to_string(*displayIdOpt).c_str())
+                               : mName;
 }
 
 void Output::setCompositionEnabled(bool enabled) {