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

Commit 9e263203 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix for P2P GO beaconing when 4way Handshake fails" into jb-mr2-dev

parents 17502c4b c77e2d74

wifi/java/android/net/wifi/p2p/WifiP2pService.java

+7 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
                         * TODO: Verify multi-channel scenarios and supplicant behavior are

                         * better before adding a time out in future

                         */

                        //Set group idle timeout of 10 sec, to avoid GO beaconing incase of any

                        //failure during 4-way Handshake.

                        if (!mAutonomousGroup) {

                            mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);

                        }

                        startDhcpServer(mGroup.getInterface());

                    } else {

                        mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);
@@ -1552,6 +1557,8 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
                case WifiMonitor.AP_STA_CONNECTED_EVENT:

                    WifiP2pDevice device = (WifiP2pDevice) message.obj;

                    String deviceAddress = device.deviceAddress;

                    // Clear timeout that was set when group was started.

                    mWifiNative.setP2pGroupIdle(mGroup.getInterface(), 0);

                    if (deviceAddress != null) {

                        if (mPeers.get(deviceAddress) != null) {

                            mGroup.addClient(mPeers.get(deviceAddress));