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
This commit is contained in:
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user