Merge "Revert setting GO idle time out" into jb-mr1-dev (d3081bc9) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);