summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2017-08-01 09:11:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-01 09:11:18 +0000
commitce24dd382d20f9e6b3e661b4e6c15a8c35c30cdd (patch)
tree5c958c8b896b2e76991c6c836064457cc33545c2 /services/java
parentf2b81340f523d11aec468a4c2ad07e9cf47fce32 (diff)
parentab608e5dbc35c7201592419c4a1081665a249ae5 (diff)
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 1 insertions, 1 deletions
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");