commit 0b86bb5675c1b8373757956b877ac354dfb939c5
author Kevin Jeon <kevinjeon@google.com> Fri Apr 19 17:29:31 2024 -0400
committer Kevin Jeon <kevinjeon@google.com> Mon Apr 22 15:37:23 2024 -0400
tree b88cb704f29cc95ae9a3218f4a212bd2dda0d65a
parent 77c1a2cdb4635db877320e411891b0df165fc8a5

Simplify default trace tag set for user builds

This change updates the default tag set for user builds to be {userdebug
tags minus user-unavailable tags} instead of {specific tag set for user
builds}. This is intended to simplify the upcoming changes for preset
trace configs, so that each preset doesn't require two versions.

Test: Check that the default tags for user and userdebug builds is
      correct.
Bug: 306420759
Change-Id: I858a81a51da63db51b9c9c566e4af352a0d27497

src/com/android/traceur/Receiver.java

diff --git a/src/com/android/traceur/Receiver.java b/src/com/android/traceur/Receiver.java
index ee969a7..39ff6ad 100644
--- a/src/com/android/traceur/Receiver.java
+++ b/src/com/android/traceur/Receiver.java
@@ -55,17 +55,13 @@
     public static final String NOTIFICATION_CHANNEL_TRACING = "trace-is-being-recorded";
     public static final String NOTIFICATION_CHANNEL_OTHER = "system-tracing";
 
-    private static final List<String> TRACE_TAGS = Arrays.asList(
+    private static final List<String> DEFAULT_TRACE_TAGS = Arrays.asList(
             "aidl", "am", "binder_driver", "camera", "dalvik", "disk", "freq",
             "gfx", "hal", "idle", "input", "memory", "memreclaim", "network", "power",
             "res", "sched", "ss", "sync", "thermal", "view", "webview", "wm", "workq");
-
-    /* The user list doesn't include workq or sync, because the user builds don't have
-     * permissions for them. */
-    private static final List<String> TRACE_TAGS_USER = Arrays.asList(
-            "aidl", "am", "binder_driver", "camera", "dalvik", "disk", "freq",
-            "gfx", "hal", "idle", "input", "memory", "memreclaim", "network", "power",
-            "res", "sched", "ss", "thermal", "view", "webview", "wm");
+    private static final List<String> USER_BUILD_DISABLED_TRACE_TAGS = Arrays.asList(
+            "workq", "sync"
+    );
 
     private static final String TAG = "Traceur";
 
@@ -379,8 +375,10 @@
 
     public static Set<String> getDefaultTagList() {
         if (mDefaultTagList == null) {
-            mDefaultTagList = new ArraySet<String>(Build.TYPE.equals("user")
-                ? TRACE_TAGS_USER : TRACE_TAGS);
+            mDefaultTagList = new ArraySet<String>(DEFAULT_TRACE_TAGS);
+            if (Build.TYPE.equals("user")) {
+                mDefaultTagList.removeAll(USER_BUILD_DISABLED_TRACE_TAGS);
+            }
         }
 
         return mDefaultTagList;