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

Commit 5eb2b0ca authored by Vinit Deshapnde's avatar Vinit Deshapnde Committed by Android (Google) Code Review
Browse files

Merge "Set P2p statemachine's network manager before starting Wifi" into klp-dev

parents c7c7f5b5 04675f6a

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);

                }