Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ed4e98 authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android Git Automerger
Browse files

am 78624d61: am 5eb2b0ca: Merge "Set P2p statemachine\'s network manager... 

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

* commit '78624d61':
  Set P2p statemachine's network manager before starting Wifi
parents 3a1abeac 78624d61

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }