From bef7e809edd48b71727fe72c937742ab00a11345 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 27 Jun 2019 15:01:01 +0100 Subject: Remove the ability to turn off TimeDetectorService Remove the ability to turn off TimeDetectorService. After http://r.android.com/1000492 it will be required in all cases. Also remove [Old|New]NetworkTimeUpdateService as the expected changes have not been implemented. Bug: 133492648 Test: build only Change-Id: Iad7ff59b19fa54750831819c68b7b733e5763902 --- services/java/com/android/server/SystemServer.java | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'services/java/com/android/server/SystemServer.java') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 3ec8b2efa8a2..1a889109d933 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1449,16 +1449,13 @@ public final class SystemServer { } t.traceEnd(); - final boolean useNewTimeServices = true; - if (useNewTimeServices) { - t.traceBegin("StartTimeDetectorService"); - try { - mSystemServiceManager.startService(TIME_DETECTOR_SERVICE_CLASS); - } catch (Throwable e) { - reportWtf("starting StartTimeDetectorService service", e); - } - t.traceEnd(); + t.traceBegin("StartTimeDetectorService"); + try { + mSystemServiceManager.startService(TIME_DETECTOR_SERVICE_CLASS); + } catch (Throwable e) { + reportWtf("starting StartTimeDetectorService service", e); } + t.traceEnd(); if (!isWatch) { t.traceBegin("StartSearchManagerService"); @@ -1656,12 +1653,7 @@ public final class SystemServer { if (!isWatch && !disableNetworkTime) { t.traceBegin("StartNetworkTimeUpdateService"); try { - if (useNewTimeServices) { - networkTimeUpdater = new NewNetworkTimeUpdateService(context); - } else { - networkTimeUpdater = new OldNetworkTimeUpdateService(context); - } - Slog.d(TAG, "Using networkTimeUpdater class=" + networkTimeUpdater.getClass()); + networkTimeUpdater = new NetworkTimeUpdateServiceImpl(context); ServiceManager.addService("network_time_update_service", networkTimeUpdater); } catch (Throwable e) { reportWtf("starting NetworkTimeUpdate service", e); -- cgit v1.2.3