Merge "Include PID and UID in offscreen hierarchy dumping" into main

Wenhui Yang · Android (Google) Code Review · commit 24bae188ac65 · 2024-11-05T20:03:04.000Z
diff --git a/services/surfaceflinger/FrontEnd/LayerHierarchy.cpp b/services/surfaceflinger/FrontEnd/LayerHierarchy.cpp
@@ -166,7 +166,8 @@ void LayerHierarchy::dump(std::ostream& out, const std::string& prefix,
             }
             out << "(Mirroring) ";
         }
-        out << *mLayer;
+
+        out << *mLayer << " pid=" << mLayer->ownerPid.val() << " uid=" << mLayer->ownerUid.val();
     }
 
     for (size_t i = 0; i < mChildren.size(); i++) {

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@ void LayerHierarchy::dump(std::ostream& out, const std::string& prefix,`
`166`	`166`	`}`
`167`	`167`	`out << "(Mirroring) ";`
`168`	`168`	`}`
`169`		`- out << *mLayer;`
	`169`	`+`
	`170`	`+ out << *mLayer << " pid=" << mLayer->ownerPid.val() << " uid=" << mLayer->ownerUid.val();`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`for (size_t i = 0; i < mChildren.size(); i++) {`