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

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

Merge "Deprecate methods that should only be used when the client side... 

Merge "Deprecate methods that should only be used when the client side protologging flag is off" into main
parents 8b961419 e62c5dcd

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

+15 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,7 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
    private final ProtoLogDataSource mDataSource;

    private final ProtoLogDataSource mDataSource;

    @Nullable

    @Nullable

    private final ProtoLogViewerConfigReader mViewerConfigReader;

    private final ProtoLogViewerConfigReader mViewerConfigReader;

    @Deprecated

    @Nullable

    @Nullable

    private final ViewerConfigInputStreamProvider mViewerConfigInputStreamProvider;

    private final ViewerConfigInputStreamProvider mViewerConfigInputStreamProvider;

    @NonNull

    @NonNull
@@ -148,6 +149,7 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
                cacheUpdater, groups);

                cacheUpdater, groups);

    }

    }





    @Deprecated

    @VisibleForTesting

    @VisibleForTesting

    public PerfettoProtoLogImpl(

    public PerfettoProtoLogImpl(

            @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,

            @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,
@@ -160,6 +162,18 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
                groups, dataSourceBuilder, configurationService);

                groups, dataSourceBuilder, configurationService);

    }

    }





    @VisibleForTesting

    public PerfettoProtoLogImpl(

            @Nullable String viewerConfigFilePath,

            @Nullable ProtoLogViewerConfigReader viewerConfigReader,

            @NonNull Runnable cacheUpdater,

            @NonNull IProtoLogGroup[] groups,

            @NonNull ProtoLogDataSourceBuilder dataSourceBuilder,

            @NonNull ProtoLogConfigurationService configurationService) {

        this(viewerConfigFilePath, null, viewerConfigReader, cacheUpdater,

                groups, dataSourceBuilder, configurationService);

    }



    private PerfettoProtoLogImpl(

    private PerfettoProtoLogImpl(

            @Nullable String viewerConfigFilePath,

            @Nullable String viewerConfigFilePath,

            @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,

            @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,
@@ -449,6 +463,7 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
        Log.d(LOG_TAG, "Finished onTracingFlush");

        Log.d(LOG_TAG, "Finished onTracingFlush");

    }

    }





    @Deprecated

    private void dumpViewerConfig() {

    private void dumpViewerConfig() {

        if (mViewerConfigInputStreamProvider == null) {

        if (mViewerConfigInputStreamProvider == null) {

            // No viewer config available

            // No viewer config available