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

Commit 892e8a5f authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes I3d1d9502,I9f828fc0 into main 

* changes:
  Remove mDataSource.flush() call
  Update the exhaust policy of ProtoLog
parents e604171b eff7b2f4

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

+2 −3
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
            Runnable cacheUpdater

    ) {

        Producer.init(InitArguments.DEFAULTS);

        mDataSource.register(DataSourceParams.DEFAULTS);

        mDataSource.register(new DataSourceParams(

                DataSourceParams.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_STALL_AND_ABORT));

        this.mViewerConfigInputStreamProvider = viewerConfigInputStreamProvider;

        this.mViewerConfigReader = viewerConfigReader;

        this.mLogGroups = logGroups;
@@ -191,8 +192,6 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
                Log.e(LOG_TAG, "Failed to read ProtoLog viewer config to dump on tracing end", e);

            }

        });



        mDataSource.flush();

    }



    private static void writeViewerConfigGroup(