commit b9e776abada1a08ffbbec47dd7fa16e86a4dd00e
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 04 03:15:35 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 04 03:15:35 2019 +0000
tree 26d254df0e15e7e5332491f4d9fcc21b5d6aa3ed
parent db8dcc42354e908a3aad3364f4950de0662a73a5
parent 556424d0760690d6ac8c1e7424cadd2bc0102d7c

Snap for 5631427 from 556424d0760690d6ac8c1e7424cadd2bc0102d7c to qt-release

Change-Id: I2a7d20286bc1e9d1b04c945ad1fa978948365b62

src/com/android/internal/car/CarServiceHelperService.java

diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index b942b46..f8842d4 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -276,7 +276,7 @@
             return;
         }
         TimingsTraceLog traceLog = new TimingsTraceLog("SystemServerTiming",
-                Trace.TRACE_TAG_ACTIVITY_MANAGER);
+                Trace.TRACE_TAG_SYSTEM_SERVER);
         traceLog.traceBegin("User0Unlock");
         try {
             // This is for force changing state into RUNNING_LOCKED. Otherwise unlock does not