diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2013-05-10 15:26:30 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-10 15:26:30 -0700 |
commit | a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee (patch) | |
tree | 0dd03432579f0e1857d1177bc12e62e03a10ed69 /wifi | |
parent | e6abfd96564b464a3ac583ac0644d3680b8a9cdf (diff) | |
parent | 408ad99dd307ae93abec76821d343b8e080c99c9 (diff) | |
download | frameworks_base-a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee.zip frameworks_base-a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee.tar.gz frameworks_base-a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee.tar.bz2 |
am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."
* commit '408ad99dd307ae93abec76821d343b8e080c99c9':
frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index 447ddb0..0f7c84f 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -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)); |