diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-05-02 11:42:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 11:42:09 -0700 |
| commit | d07223f8294bbc32c9dbbee295e5c0739ce09550 (patch) | |
| tree | f71558c4c2a6c426e6794181f6d9fe32d82ca129 /wifi | |
| parent | 7a6a4bf1b5905d3136ca883fff1d432e7c260298 (diff) | |
| parent | a3cbe75c93f96acdd3e0c4a5f6de5c50c2d6ea85 (diff) | |
| download | frameworks_base-d07223f8294bbc32c9dbbee295e5c0739ce09550.zip frameworks_base-d07223f8294bbc32c9dbbee295e5c0739ce09550.tar.gz frameworks_base-d07223f8294bbc32c9dbbee295e5c0739ce09550.tar.bz2 | |
Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index a85083d..b49f46c 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1813,8 +1813,7 @@ public class WifiStateMachine extends StateMachine { replyToMessage(message, message.what, FAILURE); break; case CMD_GET_CONFIGURED_NETWORKS: - replyToMessage(message, message.what, - mWifiConfigStore.getConfiguredNetworks()); + replyToMessage(message, message.what, (List<WifiConfiguration>) null); break; case CMD_ENABLE_RSSI_POLL: mEnableRssiPolling = (message.arg1 == 1); @@ -2353,6 +2352,10 @@ public class WifiStateMachine extends StateMachine { } } break; + case CMD_GET_CONFIGURED_NETWORKS: + replyToMessage(message, message.what, + mWifiConfigStore.getConfiguredNetworks()); + break; /* Cannot start soft AP while in client mode */ case CMD_START_AP: loge("Failed to start soft AP with a running supplicant"); |