commit e2c27eede562241423c02d086703b12d4b3dddd3
author Wei Liu <luciferleo@google.com> Thu Feb 04 18:23:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 18:23:59 2016 +0000
tree e0d8c3778b2d94455e0327f03b1110d4bf8d47cb
parent fbd88d132e3d75c9f1af607fc1ba00a6596d7406
parent c47749f9908b5d98397379fb3bf80d330f9c8283

Merge "DO NOT MERGE ANYWHERE Put the start of RttService behind a flag." into cw-e-dev

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 900a2fc..03722f4 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -437,6 +437,7 @@
         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 @@
                 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)) {