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

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

am 90d1ff0e: am 1f9806a4: Merge "Fix reconnect/reassociate handling" into jb-mr2-dev 

* commit '90d1ff0e':
  Fix reconnect/reassociate handling
parents 5aae35d8 90d1ff0e

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

+8 −3
Original line number Diff line number Diff line
@@ -3319,9 +3319,14 @@ public class WifiStateMachine extends StateMachine { 
                    }

                case CMD_RECONNECT:

                case CMD_REASSOCIATE:

                    // Drop a third party reconnect/reassociate if we are

                    // tempoarily disconnected for p2p

                    if (mTemporarilyDisconnectWifi) ret = NOT_HANDLED;

                    if (mTemporarilyDisconnectWifi) {

                        // Drop a third party reconnect/reassociate if STA is

                        // temporarily disconnected for p2p

                        break;

                    } else {

                        // ConnectModeState handles it

                        ret = NOT_HANDLED;

                    }

                    break;

                default:

                    ret = NOT_HANDLED;