diff options
| author | 2024-04-29 14:02:24 +0000 | |
|---|---|---|
| committer | 2024-04-29 14:02:24 +0000 | |
| commit | dae7a2b1985bc07ec0435a991de8e37b6180cb9e (patch) | |
| tree | 6deef43e9dea24d12af8fd4ef2c02bb98cc10b5b | |
| parent | 8309e443c97d4e0bbc01a5dadf706a5e5fe9b99c (diff) | |
| parent | f42a080570b116a2c14619edbe43c5dcf453290b (diff) | |
Merge "Set transition tracing policy to stall" into main
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/PerfettoTransitionTracer.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java index ed4ae05cb2c9..1897560deed7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java @@ -16,6 +16,8 @@ package com.android.wm.shell.transition.tracing; +import static android.tracing.perfetto.DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT; + import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellHandlerMapping; import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellHandlerMappings; import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellTransition; @@ -47,7 +49,8 @@ public class PerfettoTransitionTracer implements TransitionTracer { public PerfettoTransitionTracer() { Producer.init(InitArguments.DEFAULTS); - mDataSource.register(DataSourceParams.DEFAULTS); + mDataSource.register( + new DataSourceParams(PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT)); } /** diff --git a/services/core/java/com/android/server/wm/PerfettoTransitionTracer.java b/services/core/java/com/android/server/wm/PerfettoTransitionTracer.java index 883d27fd8854..498182dab9c3 100644 --- a/services/core/java/com/android/server/wm/PerfettoTransitionTracer.java +++ b/services/core/java/com/android/server/wm/PerfettoTransitionTracer.java @@ -16,6 +16,8 @@ package com.android.server.wm; +import static android.tracing.perfetto.DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT; + import android.annotation.NonNull; import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellTransition; import android.internal.perfetto.protos.TracePacketOuterClass.TracePacket; @@ -39,7 +41,8 @@ class PerfettoTransitionTracer implements TransitionTracer { PerfettoTransitionTracer() { Producer.init(InitArguments.DEFAULTS); - mDataSource.register(DataSourceParams.DEFAULTS); + mDataSource.register( + new DataSourceParams(PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT)); } /** |