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

Commit daa618e3 authored by Yuhao Zheng's avatar Yuhao Zheng
Browse files

WifiService and WifiPasspointService hook up 

- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase

Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
parent 0dcecc1c

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

+5 −5
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public final class SystemServer { 
    private static final String WIFI_SERVICE_CLASS =

            "com.android.server.wifi.WifiService";

    private static final String WIFI_PASSPOINT_SERVICE_CLASS =

            "com.android.server.wifi.passpoint.PasspointService";

            "com.android.server.wifi.passpoint.WifiPasspointService";

    private static final String WIFI_P2P_SERVICE_CLASS =

            "com.android.server.wifi.p2p.WifiP2pService";

    private static final String HDMI_CEC_SERVICE_CLASS =
@@ -644,15 +644,15 @@ public final class SystemServer { 
                }



                try {

                    mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                    mSystemServiceManager.startService(WIFI_PASSPOINT_SERVICE_CLASS);

                } catch (Throwable e) {

                    reportWtf("starting Wi-Fi Service", e);

                    reportWtf("starting Wi-Fi PasspointService", e);

                }



                try {

                    mSystemServiceManager.startService(WIFI_PASSPOINT_SERVICE_CLASS);

                    mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                } catch (Throwable e) {

                    reportWtf("starting Wi-Fi PasspointService", e);

                    reportWtf("starting Wi-Fi Service", e);

                }



                try {