Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a224b0f authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

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

* commit 'd07223f8':
  Fix getConfiguredNetworks when wifi is disabled
parents 78e23609 d07223f8

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

+5 −2
Original line number Diff line number Diff line
@@ -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");