diff options
| author | 2017-01-20 22:51:35 +0000 | |
|---|---|---|
| committer | 2017-01-20 22:51:36 +0000 | |
| commit | 10c514d9deb9ba4251bb1ccdf619937ed50aca4e (patch) | |
| tree | b7757edbe48d6a79ee13441d3dbf4c4800c73a3a | |
| parent | a2ef6b5741e9dfc02cac1376b3b743ac2cdbefd9 (diff) | |
| parent | aa9821bf323941a98828329b31d5dd164be6cb56 (diff) | |
Merge "SystemServer: reorder wifi services start"
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2477e7152b00..27d95a4603a6 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -834,6 +834,15 @@ public final class SystemServer { } 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( PackageManager.FEATURE_WIFI_AWARE)) { mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS); @@ -845,13 +854,6 @@ public final class SystemServer { PackageManager.FEATURE_WIFI_DIRECT)) { 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) || mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) { |