From 2be098c2b56ac4f53d2254cd850b8861fa15b1e1 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Thu, 7 Jan 2021 16:01:02 -0800
Subject: [PATCH] Making it easier to investigate jank and latency traces

Shortening Cuj<> to a more meaningful J<> for jank.

Using L<> for latency will make it easier to search for
Latency traces in trace tools. Using getNameOfAction() for
latencies in all places will simplify finding latencies in code.

Test: manual
Bug: 177018359
Change-Id: Ie3114e7d7f97e7950af19a014d06f5c632a607c3
---
 .../internal/jank/InteractionJankMonitor.java |  2 +-
 .../android/internal/util/LatencyTracker.java | 20 ++++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java
index 771a72c98a7aa..1e2ce288974ca 100644
--- a/core/java/com/android/internal/jank/InteractionJankMonitor.java
+++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java
@@ -463,7 +463,7 @@ public class InteractionJankMonitor {
         }
 
         public String getName() {
-            return "Cuj<" + getNameOfCuj(mCujType) + ">";
+            return "J<" + getNameOfCuj(mCujType) + ">";
         }
     }
 }
diff --git a/core/java/com/android/internal/util/LatencyTracker.java b/core/java/com/android/internal/util/LatencyTracker.java
index 254c2997fa65c..1e9801f5ef306 100644
--- a/core/java/com/android/internal/util/LatencyTracker.java
+++ b/core/java/com/android/internal/util/LatencyTracker.java
@@ -91,18 +91,6 @@ public class LatencyTracker {
      */
     public static final int ACTION_START_RECENTS_ANIMATION = 8;
 
-    private static final String[] NAMES = new String[]{
-            "expand panel",
-            "toggle recents",
-            "fingerprint wake-and-unlock",
-            "check credential",
-            "check credential unlocked",
-            "turn on screen",
-            "rotate the screen",
-            "face wake-and-unlock",
-            "start recents-animation",
-    };
-
     private static final int[] STATSD_ACTION = new int[]{
             FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_EXPAND_PANEL,
             FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_TOGGLE_RECENTS,
@@ -185,6 +173,10 @@ public class LatencyTracker {
         }
     }
 
+    private String getTraceNameOfAcion(int action) {
+        return "L<" + getNameOfAction(action) + ">";
+    }
+
     public static boolean isEnabled(Context ctx) {
         return getInstance(ctx).isEnabled();
     }
@@ -202,7 +194,7 @@ public class LatencyTracker {
         if (!isEnabled()) {
             return;
         }
-        Trace.asyncTraceBegin(Trace.TRACE_TAG_APP, NAMES[action], 0);
+        Trace.asyncTraceBegin(Trace.TRACE_TAG_APP, getTraceNameOfAcion(action), 0);
         mStartRtc.put(action, SystemClock.elapsedRealtime());
     }
 
@@ -221,7 +213,7 @@ public class LatencyTracker {
             return;
         }
         mStartRtc.delete(action);
-        Trace.asyncTraceEnd(Trace.TRACE_TAG_APP, NAMES[action], 0);
+        Trace.asyncTraceEnd(Trace.TRACE_TAG_APP, getTraceNameOfAcion(action), 0);
         logAction(action, (int) (endRtc - startRtc));
     }