diff options
| author | Neil Fuller <nfuller@google.com> | 2020-09-18 17:43:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-18 17:43:50 +0000 |
| commit | 99bba2b91ee2dc43ee229fa402956ef491369e91 (patch) | |
| tree | 82b7dfbfcd93cbb8d501ea4a059d36a190407375 /services/java/com/android/server | |
| parent | ca43ae658aa475ba4c83e543bf5cef08325cff14 (diff) | |
| parent | 95126bcefd4b9ac156bd44d83cdb11ceac0ec496 (diff) | |
Merge "Initial version of LocationTimeZoneManagerService"
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ddd23778884a..eca9f1556d43 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -293,6 +293,8 @@ public final class SystemServer { "com.android.server.timedetector.TimeDetectorService$Lifecycle"; private static final String TIME_ZONE_DETECTOR_SERVICE_CLASS = "com.android.server.timezonedetector.TimeZoneDetectorService$Lifecycle"; + private static final String LOCATION_TIME_ZONE_MANAGER_SERVICE_CLASS = + "com.android.server.location.timezone.LocationTimeZoneManagerService$Lifecycle"; private static final String ACCESSIBILITY_MANAGER_SERVICE_CLASS = "com.android.server.accessibility.AccessibilityManagerService$Lifecycle"; private static final String ADB_SERVICE_CLASS = @@ -1621,7 +1623,7 @@ public final class SystemServer { try { mSystemServiceManager.startService(TIME_DETECTOR_SERVICE_CLASS); } catch (Throwable e) { - reportWtf("starting StartTimeDetectorService service", e); + reportWtf("starting TimeDetectorService service", e); } t.traceEnd(); @@ -1629,7 +1631,15 @@ public final class SystemServer { try { mSystemServiceManager.startService(TIME_ZONE_DETECTOR_SERVICE_CLASS); } catch (Throwable e) { - reportWtf("starting StartTimeZoneDetectorService service", e); + reportWtf("starting TimeZoneDetectorService service", e); + } + t.traceEnd(); + + t.traceBegin("StartLocationTimeZoneManagerService"); + try { + mSystemServiceManager.startService(LOCATION_TIME_ZONE_MANAGER_SERVICE_CLASS); + } catch (Throwable e) { + reportWtf("starting LocationTimeZoneManagerService service", e); } t.traceEnd(); |