From 325f4ec502087946adb7b6e1d3b09069e4dcf4a6 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Fri, 10 May 2024 02:11:18 -0700
Subject: [PATCH] Add debug trace JSON nesting per component.

PiperOrigin-RevId: 632424814
---
 .../src/main/java/androidx/media3/effect/DebugTraceUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java b/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java
index 762b5bd5c1..82b4b12538 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java
@@ -229,8 +229,8 @@ public final class DebugTraceUtil {
     try {
       jsonWriter.beginObject();
       for (Map.Entry<String, List<String>> componentToEvents : COMPONENTS_TO_EVENTS.entrySet()) {
-        List<String> componentEvents = componentToEvents.getValue();
-        for (String eventType : componentEvents) {
+        jsonWriter.name(componentToEvents.getKey()).beginObject();
+        for (String eventType : componentToEvents.getValue()) {
           jsonWriter.name(eventType);
           if (!events.containsKey(eventType)) {
             jsonWriter.value("No events");
@@ -238,6 +238,7 @@ public final class DebugTraceUtil {
             checkNotNull(events.get(eventType)).toJson(jsonWriter);
           }
         }
+        jsonWriter.endObject();
       }
       jsonWriter.endObject();
       return stringWriter.toString();