Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 50fcdf9d: am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev

Browse Source 
* commit '50fcdf9d46e3029428e00a6a0083e5395ed029f1':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
This commit is contained in:
Chenjie Luo
2014-10-16 20:32:06 +00:00
committed by Android Git Automerger
parent 216d08ffd5 50fcdf9d46
commit e1d07b9eba
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/SystemServer.java
View File

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