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

am 61e42262: Fix group join CTS test

Browse Source 
* commit '61e42262000549b78843f0959043fec8367ed189':
  Fix group join CTS test
This commit is contained in:
Irfan Sheriff
2012-10-19 12:40:40 -07:00
committed by Android Git Automerger
parent af26ac3130 61e4226200
commit cacc479207
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1467,6 +1467,12 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
if (mGroup.isGroupOwner()) {
setWifiP2pInfoOnGroupFormation(SERVER_ADDRESS);
}
// In case of a negotiation group, connection changed is sent
// after a client joins. For autonomous, send now
if (mAutonomousGroup) {
sendP2pConnectionChangedBroadcast();
}
}
@Override
@@ -1481,7 +1487,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
deviceAddress.equals(mSavedProvDiscDevice.deviceAddress)) {
mSavedProvDiscDevice = null;
}
mGroup.addClient(mPeers.get(deviceAddress));
if (mPeers.get(deviceAddress) != null) {
mGroup.addClient(mPeers.get(deviceAddress));
} else {
mGroup.addClient(deviceAddress);
}
mPeers.updateStatus(deviceAddress, WifiP2pDevice.CONNECTED);
if (DBG) logd(getName() + " ap sta connected");
sendP2pPeersChangedBroadcast();