am 8fac6682: Merge "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" into lmp-sprout-dev

* commit '8fac66821cc12104999bb87c900abff659160a44':
  Add system property config.disable_timeupdate to configure NetworkTimeUpdateService
This commit is contained in:
Chenjie Luo
2014-10-16 19:01:30 +00:00
committed by Android Git Automerger

View File

@@ -416,6 +416,8 @@ public final class SystemServer {
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 {
@@ -863,7 +865,7 @@ public final class SystemServer {
reportWtf("starting SamplingProfiler Service", e);
}
if (!disableNetwork) {
if (!disableNetwork && !disableNetworkTimeProtocol) {
try {
Slog.i(TAG, "NetworkTimeUpdateService");
networkTimeUpdater = new NetworkTimeUpdateService(context);