Merge "Log snapshot's secure status in SurfaceFlinger dumpsys." into main

Yi Jiang · Android (Google) Code Review · commit 0635155dc0a0 · 2025-02-13T13:03:58.000-08:00
diff --git a/services/surfaceflinger/FrontEnd/LayerSnapshot.cpp b/services/surfaceflinger/FrontEnd/LayerSnapshot.cpp
@@ -305,7 +305,11 @@ std::ostream& operator<<(std::ostream& out, const LayerSnapshot& obj) {
             out << rootId << ",";
         }
     }
-    out << "] " << obj.name << "\n    " << (obj.isVisible ? "visible" : "invisible")
+    out << "] ";
+    if (obj.isSecure) {
+        out << "(Secure) ";
+    }
+    out << obj.name << "\n    " << (obj.isVisible ? "visible" : "invisible")
         << " reason=" << obj.getIsVisibleReason();
 
     if (!obj.geomLayerBounds.isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,11 @@ std::ostream& operator<<(std::ostream& out, const LayerSnapshot& obj) {`
`305`	`305`	`out << rootId << ",";`
`306`	`306`	`}`
`307`	`307`	`}`
`308`		`- out << "] " << obj.name << "\n " << (obj.isVisible ? "visible" : "invisible")`
	`308`	`+ out << "] ";`
	`309`	`+ if (obj.isSecure) {`
	`310`	`+ out << "(Secure) ";`
	`311`	`+ }`
	`312`	`+ out << obj.name << "\n " << (obj.isVisible ? "visible" : "invisible")`
`309`	`313`	`<< " reason=" << obj.getIsVisibleReason();`
`310`	`314`
`311`	`315`	`if (!obj.geomLayerBounds.isEmpty()) {`