commit 66e1cd895d203963f1d0d2783e8ebafdb0ee313f
author Ioannis Ilkos <ilkos@google.com> Fri May 03 10:47:30 2019 +0100
committer Ioannis Ilkos <ilkos@google.com> Fri May 03 11:26:03 2019 +0100
tree 29198776cc48cde834739a29d79ddba8cc403c00
parent d2ff5562a4b48f7fdd1028b1789e31244e1007a8

Enable tracepoint for hot activity starts

Bug: 131855693
Test: atest ActivityMetricsLoggerTests
Change-Id: I2adb00f4fc05ab4f67f27dc5565de3e00bc601a3

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

diff --git a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
index 0891ba4..9decb58 100644
--- a/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
+++ b/services/core/java/com/android/server/wm/ActivityMetricsLogger.java
@@ -965,16 +965,13 @@
      * @param info
      * */
     private void startTraces(WindowingModeTransitionInfo info) {
-        if (info == null) {
+        if (!Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER) || info == null
+                || info.launchTraceActive) {
             return;
         }
-        int transitionType = getTransitionType(info);
-        if (!info.launchTraceActive && transitionType == TYPE_TRANSITION_WARM_LAUNCH
-                || transitionType == TYPE_TRANSITION_COLD_LAUNCH) {
-            Trace.asyncTraceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching: "
-                    + info.launchedActivity.packageName, 0);
-            info.launchTraceActive = true;
-        }
+        Trace.asyncTraceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "launching: "
+                + info.launchedActivity.packageName, 0);
+        info.launchTraceActive = true;
     }
 
     private void stopLaunchTrace(WindowingModeTransitionInfo info) {