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

Merge "SystemServer: reorder wifi services start" am: 10c514d9de

Browse Source 
am: eae39fd1ec

Change-Id: I723d8b96f5d5406e8f948885a845993e755ab0d8
This commit is contained in:
Rebecca Silberstein
2017-01-20 23:07:10 +00:00
committed by android-build-merger
parent 4a0a4664b9 eae39fd1ec
commit 5c00ee28b2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,6 +836,15 @@ public final class SystemServer {
} }
Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
// Wifi Service must be started first for wifi-related services.
mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
mSystemServiceManager.startService(
"com.android.server.wifi.scanner.WifiScanningService");
if (!disableRtt) {
mSystemServiceManager.startService("com.android.server.wifi.RttService");
}
if (context.getPackageManager().hasSystemFeature( if (context.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WIFI_AWARE)) { PackageManager.FEATURE_WIFI_AWARE)) {
mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS); mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS);
@@ -847,13 +856,6 @@ public final class SystemServer {
PackageManager.FEATURE_WIFI_DIRECT)) { PackageManager.FEATURE_WIFI_DIRECT)) {
mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS); mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);
} }
mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
mSystemServiceManager.startService(
"com.android.server.wifi.scanner.WifiScanningService");
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)) {