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

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

Browse Source
This commit is contained in:
Wei Liu
2016-02-04 18:23:59 +00:00
committed by Android (Google) Code Review
parent fbd88d132e c47749f990
commit e2c27eede5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,6 +437,7 @@ public final class SystemServer {
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 disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);
boolean disableRtt = SystemProperties.getBoolean("config.disable_rtt", false);
boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1"); boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
try { try {
@@ -697,7 +698,9 @@ public final class SystemServer {
mSystemServiceManager.startService( mSystemServiceManager.startService(
"com.android.server.wifi.WifiScanningService"); "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) || if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) ||
mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) { mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {