From ab608e5dbc35c7201592419c4a1081665a249ae5 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Fri, 28 Jul 2017 17:16:11 +0100
Subject: Fix tracing call for RulesManagerService startup

The tracing call was correct for aosp/master, but the tracing
code had been changed internally. The incorrect call meant it
wasn't actually tracking the points we're interested in and
it was reporting incorrectly (by ~1000 millis).

Bug: 64141572
Test: boot device / adb logcat
Change-Id: If11354d1d73cf90973ed4f43e885ae28ca1346ea
(cherry picked from commit a87cd5daa0bee1ed045e726194fca2deab6d88c5)
---
 services/java/com/android/server/SystemServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'services/java')

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 61267ef5047a..7b027bbf5661 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1203,7 +1203,7 @@ public final class SystemServer {
             if (startRulesManagerService) {
                 traceBeginAndSlog("StartTimeZoneRulesManagerService");
                 mSystemServiceManager.startService(TIME_ZONE_RULES_MANAGER_SERVICE_CLASS);
-                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
+                traceEnd();
             }
 
             traceBeginAndSlog("StartAudioService");
-- 
cgit v1.2.3-59-g8ed1b