Fix system profile crash if subgroup has no tracks

google · Oct 22, 2024 · 990afe0 · 990afe0
1 parent eb52b61
commit 990afe0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/gapic/src/main/com/google/gapid/perfetto/models/TrackConfig.java b/gapic/src/main/com/google/gapid/perfetto/models/TrackConfig.java
@@ -107,12 +107,14 @@ public Builder() {
     public Builder addGroup(String parent, String id, String name, Group.UiFactory ui) {
       groups.computeIfAbsent(parent, $ -> Lists.newArrayList())
           .add(newElement(id, name, false, ui));
+      groups.computeIfAbsent(id, $ -> Lists.newArrayList());
       return this;
     }
 
     public Builder addLabelGroup(String parent, String id, String name, Group.UiFactory ui) {
       groups.computeIfAbsent(parent, $ -> Lists.newArrayList())
           .add(newElement(id, name, true, ui));
+      groups.computeIfAbsent(id, $ -> Lists.newArrayList());
       return this;
     }
 
@@ -143,7 +145,9 @@ private Group buildGroup(String id) {
       ImmutableList.Builder<Element<?>> children = ImmutableList.builder();
       for (ElementBuilder child : groups.get(id)) {
         if (groups.containsKey(child.id)) {
-          children.add(buildGroup(child.id));
+          if(!groups.get(child.id).isEmpty()) {
+            children.add(buildGroup(child.id));
+          }
         } else {
           children.add(child.track());
         }