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

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

am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev 

* commit '4e7f2ffe':
  Handle group tear down only at group removed event
parents 2ca85c20 4e7f2ffe

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

+11 −3
Original line number Diff line number Diff line
@@ -1566,9 +1566,17 @@ public class WifiP2pService extends IWifiP2pManager.Stub { 
                                WifiP2pManager.ERROR);

                    }

                    break;

                /* The supplicant misses the group removed event at times and just

                 * sends a network disconnect event */

                case WifiMonitor.NETWORK_DISCONNECTION_EVENT:

                /* We do not listen to NETWORK_DISCONNECTION_EVENT for group removal

                 * handling since supplicant actually tries to reconnect after a temporary

                 * 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:

                    if (DBG) logd(getName() + " group removed");

                    handleGroupRemoved();