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

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

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

* commit 'd3081bc9':
  Revert setting GO idle time out
parents 66e92752 d3081bc9

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

+8 −1
Original line number Diff line number Diff line
@@ -1231,10 +1231,17 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
                                mGroup.getNetworkName()));

                    }



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

                    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());

                    } else {

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

                        mDhcpStateMachine = DhcpStateMachine.makeDhcpStateMachine(mContext,

                                P2pStateMachine.this, mGroup.getInterface());

                        mDhcpStateMachine.sendMessage(DhcpStateMachine.CMD_START_DHCP);