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

Commit 2c86df31 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 91983320: am 35182905: Merge "Fix WPS handling when already connected" into jb-mr2-dev 

* commit '91983320':
  Fix WPS handling when already connected
parents bdd97e02 91983320

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -3357,9 +3357,13 @@ public class WifiStateMachine extends StateMachine { 
        public boolean processMessage(Message message) {

        public boolean processMessage(Message message) {

            switch (message.what) {

            switch (message.what) {

                case WifiMonitor.WPS_SUCCESS_EVENT:

                case WifiMonitor.WPS_SUCCESS_EVENT:

                    // Ignore intermediate success, wait for full connection

                    break;

                case WifiMonitor.NETWORK_CONNECTION_EVENT:

                    replyToMessage(mSourceMessage, WifiManager.WPS_COMPLETED);

                    replyToMessage(mSourceMessage, WifiManager.WPS_COMPLETED);

                    mSourceMessage.recycle();

                    mSourceMessage.recycle();

                    mSourceMessage = null;

                    mSourceMessage = null;

                    deferMessage(message);

                    transitionTo(mDisconnectedState);

                    transitionTo(mDisconnectedState);

                    break;

                    break;

                case WifiMonitor.WPS_OVERLAP_EVENT:

                case WifiMonitor.WPS_OVERLAP_EVENT:
@@ -3403,7 +3407,6 @@ public class WifiStateMachine extends StateMachine { 
                case CMD_ENABLE_NETWORK:

                case CMD_ENABLE_NETWORK:

                case CMD_RECONNECT:

                case CMD_RECONNECT:

                case CMD_REASSOCIATE:

                case CMD_REASSOCIATE:

                case WifiMonitor.NETWORK_CONNECTION_EVENT: /* Handled after exiting WPS state */

                    deferMessage(message);

                    deferMessage(message);

                    break;

                    break;

                case WifiMonitor.NETWORK_DISCONNECTION_EVENT:

                case WifiMonitor.NETWORK_DISCONNECTION_EVENT: