From 29f70de9e8884bbda8a4e58b5413102a09dfcd24 Mon Sep 17 00:00:00 2001
From: Keun-young Park <keunyoung@google.com>
Date: Thu, 7 Feb 2019 09:33:12 -0800
Subject: [PATCH] Add non-system user unlock time to timing trace

- Car activates non-0 user during bootup always.

Bug: 124050780
Test: Check log during bootup
Change-Id: I502f291277d968ddc84b66439934c4bc80f1658c
(cherry picked from commit f3dbedd902759f5b6b6fd7c34da2c53429947851)
---
 services/core/java/com/android/server/am/UserController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java
index c981e6885a9e3..7f6648a3d1747 100644
--- a/services/core/java/com/android/server/am/UserController.java
+++ b/services/core/java/com/android/server/am/UserController.java
@@ -2072,7 +2072,8 @@ class UserController implements Handler.Callback {
                 new TimingsTraceLog("SystemServerTiming", Trace.TRACE_TAG_SYSTEM_SERVER)
                         .logDuration("SystemUserUnlock", unlockTime);
             } else {
-                Slog.d(TAG, "Unlocking user " + id + " took " + unlockTime + " ms");
+                new TimingsTraceLog("SystemServerTiming", Trace.TRACE_TAG_SYSTEM_SERVER)
+                        .logDuration("User" + id + "Unlock", unlockTime);
             }
         }
     };