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

Merge "Handle group tear down only at group removed event" into jb-mr1-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2012-10-24 15:23:46 -07:00
committed by Android (Google) Code Review
parent 900e0ba516 2bc0c5fef2
commit 4e7f2ffe17
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1566,9 +1566,17 @@ public class WifiP2pService extends IWifiP2pManager.Stub {
WifiP2pManager.ERROR); WifiP2pManager.ERROR);
} }
break; break;
/* The supplicant misses the group removed event at times and just /* We do not listen to NETWORK_DISCONNECTION_EVENT for group removal
* sends a network disconnect event */ * handling since supplicant actually tries to reconnect after a temporary
case WifiMonitor.NETWORK_DISCONNECTION_EVENT: * disconnect until group idle time out. Eventually, a group removal event
* will come when group has been removed.
*
* When there are connectivity issues during temporary disconnect, the application
* will also just remove the group.
*
* Treating network disconnection as group removal causes race conditions since
* supplicant would still maintain the group at that stage.
*/
case WifiMonitor.P2P_GROUP_REMOVED_EVENT: case WifiMonitor.P2P_GROUP_REMOVED_EVENT:
if (DBG) logd(getName() + " group removed"); if (DBG) logd(getName() + " group removed");
handleGroupRemoved(); handleGroupRemoved();