2 files changed, 29 insertions, 13 deletions
diff --git a/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java b/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java
index d54889463b27..646d168732ca 100644
--- a/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java
+++ b/core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java
@@ -174,19 +174,6 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto
         );
     }
 
-    @VisibleForTesting
-    public interface ProtoLogDataSourceBuilder {
-        /**
-         * Builder method for the DataSource the PerfettoProtoLogImpl is going to us.
-         * @param onStart The onStart callback that should be used by the created datasource.
-         * @param onFlush The onFlush callback that should be used by the created datasource.
-         * @param onStop The onStop callback that should be used by the created datasource.
-         * @return A new DataSource that uses the provided callbacks.
-         */
-        ProtoLogDataSource build(ProtoLogDataSource.Instance.TracingInstanceStartCallback onStart,
-                Runnable onFlush, ProtoLogDataSource.Instance.TracingInstanceStopCallback onStop);
-    }
-
     private PerfettoProtoLogImpl(
             @Nullable String viewerConfigFilePath,
             @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,
diff --git a/core/java/com/android/internal/protolog/ProtoLogDataSourceBuilder.java b/core/java/com/android/internal/protolog/ProtoLogDataSourceBuilder.java
new file mode 100644
index 000000000000..84436b92bd24
--- /dev/null
+++ b/core/java/com/android/internal/protolog/ProtoLogDataSourceBuilder.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.internal.protolog;
+
+public interface ProtoLogDataSourceBuilder {
+    /**
+     * Builder method for the DataSource the PerfettoProtoLogImpl is going to us.
+     * @param onStart The onStart callback that should be used by the created datasource.
+     * @param onFlush The onFlush callback that should be used by the created datasource.
+     * @param onStop The onStop callback that should be used by the created datasource.
+     * @return A new DataSource that uses the provided callbacks.
+     */
+    ProtoLogDataSource build(ProtoLogDataSource.Instance.TracingInstanceStartCallback onStart,
+            Runnable onFlush, ProtoLogDataSource.Instance.TracingInstanceStopCallback onStop);
+}