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

Author: isheriff

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

@@ -1231,10 +1231,17 @@ public boolean processMessage(Message message) {
                                 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);