am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake...

* commit '408ad99dd307ae93abec76821d343b8e080c99c9':
  frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.

diff --cc wifi/java/android/net/wifi/p2p/WifiP2pService.java
index 447ddb0,3325b2b..0f7c84f
--- 1/wifi/java/android/net/wifi/p2p/WifiP2pService.java
--- 2/wifi/java/android/net/wifi/p2p/WifiP2pService.java
+++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java
@@@ -1552,7 -1512,13 +1557,9 @@@ public class WifiP2pService extends IWi
                  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 (mSavedProvDiscDevice != null &&
 -                                deviceAddress.equals(mSavedProvDiscDevice.deviceAddress)) {
 -                            mSavedProvDiscDevice = null;
 -                        }
                          if (mPeers.get(deviceAddress) != null) {
                              mGroup.addClient(mPeers.get(deviceAddress));
                          } else {