commit 2cab8825b3214b67b9462eaf5a1d777e9888d488
author Chenjie Luo <cjluo@google.com> Thu Oct 16 13:31:39 2014 -0700
committer Chenjie Luo <cjluo@google.com> Thu Oct 16 13:33:25 2014 -0700
tree 7d5d85aeca9850a2ed88aea7140d1317eeb72eaf
parent fe09db1e0d5af46e7b643c37ba52f62500b7f043

Add system property config.disable_networktime to configure NetworkTimeUpdateService

Bug: 17934875
Change-Id: Ie5acf7266a5766f407db8f23d2c3d26920fa4020

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