diff options
| author | 2017-01-20 23:13:38 +0000 | |
|---|---|---|
| committer | 2017-01-20 23:13:38 +0000 | |
| commit | 844e5436a629a0999a7e2c69452e4c5fca16eb32 (patch) | |
| tree | 4d4113681fcfc762ccd7d754e9f723a467738b19 | |
| parent | 7bb9ccc1e59a87bb6ef33ddb25fe18566af90339 (diff) | |
| parent | 5c00ee28b29a769f6f30ef03bb7aae5f84a653b7 (diff) | |
Merge "SystemServer: reorder wifi services start" am: 10c514d9de am: eae39fd1ec
am: 5c00ee28b2
Change-Id: Id6eb74c4aab2cd25f1d7adff4ddff160f6132fc6
| -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 818e1726b2fe..8c4941d19323 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -841,6 +841,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); @@ -852,13 +861,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)) { |