Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev

Author: isheriff

wifi/java/android/net/wifi/WifiStateMachine.java

@@ -1813,8 +1813,7 @@ public boolean processMessage(Message message) {
                     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 boolean processMessage(Message message) {
                         }
                     }
                     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");