commit aa9821bf323941a98828329b31d5dd164be6cb56
author Rebecca Silberstein <silberst@google.com> Sat Jan 07 01:59:16 2017 -0800
committer Rebecca Silberstein <silberst@google.com> Wed Jan 18 11:01:11 2017 -0800
tree 0fde435bcd052a68b567e41d09d0111165032f46
parent 5f506939fafd724fe4cdb8ef478302c8590417ce

SystemServer: reorder wifi services start

Start WifiService before other wifi-related services.
This is now possible since service dependencies were
removed from the WifiStateMachine constructor.

Bug: 34137732
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: frameworks/base/wifi/tests/runtests.sh
Test: manually tested wifi connection
Test: manually checked for Wifi Direct peers
Merged-In: Iad4eb7053e60542d0be72208db53cf0f83004ae2
Change-Id: I1e57bfac83708644df6f016808c5972d2d6136c6

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 2477e71..27d95a4 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -834,6 +834,15 @@
                 }
                 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 @@
                         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)) {