diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-12-12 15:35:25 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-12 15:35:25 -0800 |
| commit | afb847a4692a6e5cded8c7a330d00b70b794896a (patch) | |
| tree | 4fbd8d00636eae248fcbaa058793121096125d82 /services | |
| parent | ee8005e6ecbb95dad98cf1badbeb2b66c794b790 (diff) | |
| parent | e744cfff7ca5406f7bba17a14b89856c1ca83262 (diff) | |
| download | frameworks_base-afb847a4692a6e5cded8c7a330d00b70b794896a.zip frameworks_base-afb847a4692a6e5cded8c7a330d00b70b794896a.tar.gz frameworks_base-afb847a4692a6e5cded8c7a330d00b70b794896a.tar.bz2 | |
Merge "Clean up synchronization"
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index aef3426..016dc82 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -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; + } } /** |