summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-05-02 10:24:40 -0700
committerIrfan Sheriff <isheriff@google.com>2012-05-02 11:39:54 -0700
commita3cbe75c93f96acdd3e0c4a5f6de5c50c2d6ea85 (patch)
treea8ebeb6c2888fc612798e3720ce3bcbd8b689e2a
parentfaac92942c50b12edada5e92e7c323609b2bdb5f (diff)
downloadframeworks_base-a3cbe75c93f96acdd3e0c4a5f6de5c50c2d6ea85.zip
frameworks_base-a3cbe75c93f96acdd3e0c4a5f6de5c50c2d6ea85.tar.gz
frameworks_base-a3cbe75c93f96acdd3e0c4a5f6de5c50c2d6ea85.tar.bz2
Fix getConfiguredNetworks when wifi is disabled
Bug: 6380917 Change-Id: I4c6f1a379ef2401cde739aedfc82578c03e7dcf3
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java7
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");