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

Commit 76b52250 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Change the buffer exhausted policy to drop instead of stall and abort. 

This will prevent the trace from being aborted if the buffer is exhausted, which seems to be happening in CTS tests.

Mitigations to b/340892563.

Bug: 340892563
Bug: 341076876
Change-Id: I9659f1e293ff065df28979401281d33fdc6aa0e6
parent 1fb1a60d

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_STALL_AND_ABORT;

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



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

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

                new DataSourceParams.Builder()

                        .setBufferExhaustedPolicy(

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT)

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_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_STALL_AND_ABORT;

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



import android.annotation.NonNull;

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

                new DataSourceParams.Builder()

                        .setBufferExhaustedPolicy(

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT)

                                PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP)

                        .build();

        mDataSource.register(params);

    }