Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a028d5b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update transition tracing & protolog buffer exhausted strategy" into main

parents 28b55f7c b0a3f0a4

core/java/com/android/internal/protolog/ProtoLog.java

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ public class ProtoLog { 
                        new DataSourceParams.Builder()

                                .setBufferExhaustedPolicy(

                                        DataSourceParams

                                                .PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP)

                                                .PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_DROP)

                                .build();

                sDataSource.register(params);

            }

libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.transition.tracing;



import static android.tracing.perfetto.DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP;

import static android.tracing.perfetto.DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_DROP;



import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellHandlerMapping;

import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellHandlerMappings;
@@ -53,7 +53,7 @@ public class PerfettoTransitionTracer implements TransitionTracer { 
        DataSourceParams params =

                new DataSourceParams.Builder()

                        .setBufferExhaustedPolicy(

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP)

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_DROP)

                        .build();

        mDataSource.register(params);

    }

services/core/java/com/android/server/wm/PerfettoTransitionTracer.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.wm;



import static android.tracing.perfetto.DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP;

import static android.tracing.perfetto.DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_DROP;



import android.annotation.NonNull;

import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellTransition;
@@ -45,7 +45,7 @@ class PerfettoTransitionTracer implements TransitionTracer { 
        DataSourceParams params =

                new DataSourceParams.Builder()

                        .setBufferExhaustedPolicy(

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP)

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_DROP)

                        .build();

        mDataSource.register(params);

    }