am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev

* commit '5eb2b0ca76560cb8d707295aec42cb72f379eafe': Set P2p statemachine's network manager before starting Wifi
2013-10-03 21:27:09 -07:00
parent cf51fefde3 5eb2b0ca76
commit 78624d61f1
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -515,8 +515,9 @@ class ServerThread {
                    ServiceManager.addService(Context.CONNECTIVITY_SERVICE, connectivity);
                    networkStats.bindConnectivityManager(connectivity);
                    networkPolicy.bindConnectivityManager(connectivity);
-                    wifi.checkAndStartWifi();
+
                    wifiP2p.connectivityServiceReady();
+                    wifi.checkAndStartWifi();
                } catch (Throwable e) {
                    reportWtf("starting Connectivity Service", e);
                }