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

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

Merge "When not provided set viewerConfigInputStreamProvider from viewerConfigFilePath" into main

parents 8ec3af27 62c8f5d7
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -218,6 +218,22 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto
        // NOTE: Registering that datasource is an async operation, so there may be no data traced
        // for some messages logged right after the construction of this class.
        mDataSource.register(params);

        if (viewerConfigInputStreamProvider == null && viewerConfigFilePath != null) {
            viewerConfigInputStreamProvider = new ViewerConfigInputStreamProvider() {
                @NonNull
                @Override
                public ProtoInputStream getInputStream() {
                    try {
                        return new ProtoInputStream(new FileInputStream(viewerConfigFilePath));
                    } catch (FileNotFoundException e) {
                        throw new RuntimeException(
                                "Failed to load viewer config file " + viewerConfigFilePath, e);
                    }
                }
            };
        }

        this.mViewerConfigInputStreamProvider = viewerConfigInputStreamProvider;
        this.mViewerConfigReader = viewerConfigReader;
        this.mCacheUpdater = cacheUpdater;