From c47749f9908b5d98397379fb3bf80d330f9c8283 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 3 Feb 2016 16:57:31 -0800 Subject: [PATCH] DO NOT MERGE ANYWHERE Put the start of RttService behind a flag. We can set config.disable_rtt in the init script to disable the RttService. b/26877020 Change-Id: Ifb7fedc4764329dc09cae41f06bf6d5fc7426e5f --- services/java/com/android/server/SystemServer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 08816b929d955..85c0935f038e0 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -437,6 +437,7 @@ public final class SystemServer { 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 disableRtt = SystemProperties.getBoolean("config.disable_rtt", false); boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1"); try { @@ -697,7 +698,9 @@ public final class SystemServer { mSystemServiceManager.startService( "com.android.server.wifi.WifiScanningService"); - mSystemServiceManager.startService("com.android.server.wifi.RttService"); + if (!disableRtt) { + mSystemServiceManager.startService("com.android.server.wifi.RttService"); + } if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) || mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {