diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-10-03 21:30:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 21:30:26 -0700 |
| commit | c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b (patch) | |
| tree | b37165b285601ea6338b5fd76e08fd74fe021689 /services | |
| parent | 3a1abeac3526bb772d484a16a4110241f6ab090c (diff) | |
| parent | 78624d61f1a138610bdbffe3d1c6ddf89f3472c8 (diff) | |
| download | frameworks_base-c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b.zip frameworks_base-c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b.tar.gz frameworks_base-c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b.tar.bz2 | |
am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev
* commit '78624d61f1a138610bdbffe3d1c6ddf89f3472c8':
Set P2p statemachine's network manager before starting Wifi
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ef50df7..0e0f156 100644 --- 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); } |