diff options
| author | 2017-08-01 09:19:12 +0000 | |
|---|---|---|
| committer | 2017-08-01 09:19:12 +0000 | |
| commit | 315def899f542278b1c3095a02a53188e58d400b (patch) | |
| tree | 3ff77fb02c6e62aa528b859fd884c3d95d85cbc0 /services/java | |
| parent | 797db6f8b080ffb21c1ec0c29b7b94741b143fff (diff) | |
| parent | ce24dd382d20f9e6b3e661b4e6c15a8c35c30cdd (diff) | |
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
am: ce24dd382d
Change-Id: Ifadd27aa8f05efc2244aef76fa18e6ee245b72e2
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
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 7dc3f9446b18..6090bee5d69b 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1194,7 +1194,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"); |