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

Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev

Browse Source
This commit is contained in:
Chenjie Luo
2014-10-16 20:57:55 +00:00
committed by Android (Google) Code Review
parent 68c537f198 2cab8825b3
commit 76ed803fbd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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