commit 117fcb06fc0c5986e3fcf94664ee09de43ad8080
author Steve Paik <spaik@google.com> Thu Sep 13 09:43:54 2018 -0700
committer Steve Paik <spaik@google.com> Thu Sep 13 17:20:33 2018 +0000
tree 021ecaf97fddcfbe2fefa703846ded98d60910d5
parent beb077d987bed4e45a3e6ec7e3b8468ec66e1a0b

Add disableNetworkTime config property

This was removed as part of this bug because the config wasn't used:

    Bug 64052650
    Change-Id I5c8ed3f0e78c2ed0d2e733939a82e1ab8940de22

This is now needed by Android Automotive since the network module may
live off board in a vehicle.

Bug: 110800197
Test: make & flash
Change-Id: I3715602e7fb22503d6867b61c22bdcb963174059

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 c80b9d8..bb08345 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -785,6 +785,8 @@
 
         boolean disableSystemTextClassifier = SystemProperties.getBoolean(
                 "config.disable_systemtextclassifier", false);
+        boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime",
+                false);
         boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
                 false);
         boolean disableSlices = SystemProperties.getBoolean("config.disable_slices", false);
@@ -1459,7 +1461,7 @@
                 traceEnd();
             }
 
-            if (!isWatch) {
+            if (!isWatch && !disableNetworkTime) {
                 traceBeginAndSlog("StartNetworkTimeUpdateService");
                 try {
                     if (useNewTimeServices) {