Merge "Add logging when starting a trace iteration while one is already in progress" into main

1 files changed, 3 insertions, 0 deletions

diff --git a/core/jni/android_tracing_PerfettoDataSource.cpp b/core/jni/android_tracing_PerfettoDataSource.cpp
index ea896e1678a7..56ee3dcf7ca5 100644
--- a/core/jni/android_tracing_PerfettoDataSource.cpp
+++ b/core/jni/android_tracing_PerfettoDataSource.cpp
@@ -96,6 +96,9 @@ jobject PerfettoDataSource::newInstance(JNIEnv* env, void* ds_config, size_t ds_
 
 bool PerfettoDataSource::TraceIterateBegin() {
     if (gInIteration) {
+        ALOG(LOG_ERROR, LOG_TAG,
+              "Tried calling TraceIterateBegin with an already active iterator for datasource %s.",
+              dataSourceName.c_str());
         return false;
     }