drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WifiService and WifiPasspointService hook up

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

Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
This commit is contained in:
Yuhao Zheng
2014-05-30 18:54:55 -07:00
parent 0dcecc1cab
commit daa618e3cd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/SystemServer.java
View File

@ -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 =
@ -643,18 +643,18 @@ public final class SystemServer {
reportWtf("starting Wi-Fi P2pService", e);
}
try {
mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
} catch (Throwable e) {
reportWtf("starting Wi-Fi Service", e);
}
try {
mSystemServiceManager.startService(WIFI_PASSPOINT_SERVICE_CLASS);
} catch (Throwable e) {
reportWtf("starting Wi-Fi PasspointService", e);
}
try {
mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
} catch (Throwable e) {
reportWtf("starting Wi-Fi Service", e);
}
try {
Slog.i(TAG, "Wi-Fi Scanning Service");
mSystemServiceManager.startService(