commit d25e4efdc1974131bfbdaecbec9302a891567a94
author Chenjie Luo <cjluo@google.com> Thu Oct 16 20:22:24 2014 +0000
committer Chenjie Luo <cjluo@google.com> Thu Oct 16 20:22:24 2014 +0000
tree d182dcd57e710c8d4aacc1b42e1ab623af94c2f8
parent c597c55ffeb9debcf2dba8a77a80caa9016ea4d1

Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"

This reverts commit c597c55ffeb9debcf2dba8a77a80caa9016ea4d1.

Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68

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 d8cc976..92ad1ad 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -416,8 +416,6 @@
         boolean disableSystemUI = SystemProperties.getBoolean("config.disable_systemui", false);
         boolean disableNonCoreServices = SystemProperties.getBoolean("config.disable_noncore", false);
         boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false);
-        boolean disableNetworkTimeProtocol = SystemProperties.getBoolean("config.disable_networktimeprotocol",
-                false);
         boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
 
         try {
@@ -865,7 +863,7 @@
                 reportWtf("starting SamplingProfiler Service", e);
             }
 
-            if (!disableNetwork && !disableNetworkTimeProtocol) {
+            if (!disableNetwork) {
                 try {
                     Slog.i(TAG, "NetworkTimeUpdateService");
                     networkTimeUpdater = new NetworkTimeUpdateService(context);