AOSP: Delay group formation timeout

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 68b3c9b750b0682fbb45f3ca43af762a20581413..5f1329e1d32af8deee41c207b98de892134d3b81 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -4424,7 +4424,13 @@ void wpas_p2p_network_removed(struct wpa_supplicant *wpa_s,
                                 wpa_s->parent, NULL) > 0) {
                wpa_printf(MSG_DEBUG, "P2P: Canceled group formation due to "
                           "P2P group network getting removed");
+#ifdef ANDROID_P2P
+               /* Give time for any Pending WPS Frame exchange */
+               eloop_register_timeout(5, 0, wpas_p2p_group_formation_timeout,
+                       wpa_s->parent, NULL);
+#else
                wpas_p2p_group_formation_timeout(wpa_s->parent, NULL);
+#endif
        }
 }