Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d3081bc9: Merge "Revert setting GO idle time out" into jb-mr1-dev

Browse Source 
* commit 'd3081bc9a7bc4e3d729005d1841d2834c1fd62b5':
  Revert setting GO idle time out
This commit is contained in:
Irfan Sheriff
2012-09-28 18:24:07 -07:00
committed by Android Git Automerger
parent 66e9275226 d3081bc9a7
commit bccfd5f2dc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

@@ -1231,10 +1231,17 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
mGroup.getNetworkName())); mGroup.getNetworkName()));
} }
mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);
if (mGroup.isGroupOwner()) { if (mGroup.isGroupOwner()) {
/* Setting an idle time out on GO causes issues with certain scenarios
* on clients where it can be off-channel for longer and with the power
* save modes used.
*
* TODO: Verify multi-channel scenarios and supplicant behavior are
* better before adding a time out in future
*/
startDhcpServer(mGroup.getInterface()); startDhcpServer(mGroup.getInterface());
} else { } else {
mWifiNative.setP2pGroupIdle(mGroup.getInterface(), GROUP_IDLE_TIME_S);
mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine(mContext, mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine(mContext,
P2pStateMachine.this, mGroup.getInterface()); P2pStateMachine.this, mGroup.getInterface());
mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP); mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP);