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

Merge "Clean up synchronization"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-12-12 15:35:25 -08:00
committed by Android (Google) Code Review
parent ee8005e6ec e744cfff7c
commit afb847a469
3 changed files with 210 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/WifiService.java
View File

@ -676,7 +676,12 @@ public class WifiService extends IWifiManager.Stub {
*/
public List<WifiConfiguration> getConfiguredNetworks() {
enforceAccessPermission();
return mWifiStateMachine.syncGetConfiguredNetworks();
if (mWifiStateMachineChannel != null) {
return mWifiStateMachine.syncGetConfiguredNetworks(mWifiStateMachineChannel);
} else {
Slog.e(TAG, "mWifiStateMachineChannel is not initialized");
return null;
}
}
/**