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

Merge "Enable ShadeViewDiffer systrace logs" into udc-dev

Browse Source
This commit is contained in:
Peter Kalauskas
2023-05-11 22:32:04 +00:00
committed by Android (Google) Code Review
parent cdb63f90d7 fbde6f5351
commit c7515ae352
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/log/src/com/android/systemui/log/LogBuffer.kt
View File

@@ -271,12 +271,14 @@ constructor(
} }
private fun echoToSystrace(message: LogMessage, strMessage: String) { private fun echoToSystrace(message: LogMessage, strMessage: String) {
if (Trace.isTagEnabled(Trace.TRACE_TAG_APP)) {
Trace.instantForTrack( Trace.instantForTrack(
Trace.TRACE_TAG_APP, Trace.TRACE_TAG_APP,
"UI Events", "UI Events",
"$name - ${message.level.shortString} ${message.tag}: $strMessage" "$name - ${message.level.shortString} ${message.tag}: $strMessage"
) )
} }
}
private fun echoToLogcat(message: LogMessage, strMessage: String) { private fun echoToLogcat(message: LogMessage, strMessage: String) {
when (message.level) { when (message.level) {

2
packages/SystemUI/src/com/android/systemui/log/dagger/LogModule.java
View File

@@ -60,7 +60,7 @@ public class LogModule {
if (Compile.IS_DEBUG && notifPipelineFlags.isDevLoggingEnabled()) { if (Compile.IS_DEBUG && notifPipelineFlags.isDevLoggingEnabled()) {
maxSize *= 10; maxSize *= 10;
} }
return factory.create("NotifLog", maxSize, false /* systrace */); return factory.create("NotifLog", maxSize, Compile.IS_DEBUG /* systrace */);
} }
/** Provides a logging buffer for all logs related to notifications on the lockscreen. */ /** Provides a logging buffer for all logs related to notifications on the lockscreen. */

10
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/ShadeViewDiffer.kt
View File

@@ -67,7 +67,10 @@ class ShadeViewDiffer(
fun getViewLabel(view: View): String = fun getViewLabel(view: View): String =
nodes.values.firstOrNull { node -> node.view === view }?.label ?: view.toString() nodes.values.firstOrNull { node -> node.view === view }?.label ?: view.toString()
private fun detachChildren(parentNode: ShadeNode, specMap: Map<NodeController, NodeSpec>) { private fun detachChildren(
parentNode: ShadeNode,
specMap: Map<NodeController, NodeSpec>
) = traceSection("detachChildren") {
val views = nodes.values.associateBy { it.view } val views = nodes.values.associateBy { it.view }
fun detachRecursively(parentNode: ShadeNode, specMap: Map<NodeController, NodeSpec>) { fun detachRecursively(parentNode: ShadeNode, specMap: Map<NodeController, NodeSpec>) {
val parentSpec = specMap[parentNode.controller] val parentSpec = specMap[parentNode.controller]
@@ -124,7 +127,10 @@ class ShadeViewDiffer(
} }
} }
private fun attachChildren(parentNode: ShadeNode, specMap: Map<NodeController, NodeSpec>) { private fun attachChildren(
parentNode: ShadeNode,
specMap: Map<NodeController, NodeSpec>
): Unit = traceSection("attachChildren") {
val parentSpec = checkNotNull(specMap[parentNode.controller]) val parentSpec = checkNotNull(specMap[parentNode.controller])
for ((index, childSpec) in parentSpec.children.withIndex()) { for ((index, childSpec) in parentSpec.children.withIndex()) {