am 420aec8a: am 67b086f9: am b08ee9b7: am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev

* commit '420aec8a3841d53e4aafdab3f75edb6ed59ff73b':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
This commit is contained in:
Chenjie Luo
2014-10-16 21:23:21 +00:00
committed by Android Git Automerger

View File

@@ -416,6 +416,7 @@ 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 disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);
boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
try {
@@ -863,7 +864,7 @@ public final class SystemServer {
reportWtf("starting SamplingProfiler Service", e);
}
if (!disableNetwork) {
if (!disableNetwork && !disableNetworkTime) {
try {
Slog.i(TAG, "NetworkTimeUpdateService");
networkTimeUpdater = new NetworkTimeUpdateService(context);