diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2013-10-04 11:10:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 11:10:11 -0700 |
| commit | 2ecde96ad4fea31e81b61e5b199646acbe61df3e (patch) | |
| tree | 680a38bf834250ec8bc193287427b969fa4090a4 /services | |
| parent | f7ee79b6bf08c0658674dda59ca1dc2d56b1176f (diff) | |
| parent | c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b (diff) | |
| download | frameworks_base-2ecde96ad4fea31e81b61e5b199646acbe61df3e.zip frameworks_base-2ecde96ad4fea31e81b61e5b199646acbe61df3e.tar.gz frameworks_base-2ecde96ad4fea31e81b61e5b199646acbe61df3e.tar.bz2 | |
am c9ed4e98: am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager before starting Wifi" into klp-dev
* commit 'c9ed4e98b880926d0621f10f8a9ce7a6b5f2016b':
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); } |