wifi.c: update for mr1.1

dazjo · Feb 15, 2013 · e6dbd2f · e6dbd2f
1 parent c4b7301
commit e6dbd2f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/libhardware_legacy/wifi/wifi.c b/libhardware_legacy/wifi/wifi.c
@@ -920,11 +920,19 @@ int wifi_start_supplicant(int p2p_supported)
     return -1;
 }
 
-int wifi_stop_supplicant()
+int wifi_stop_supplicant(int p2p_supported)
 {
     char supp_status[PROPERTY_VALUE_MAX] = {'\0'};
     int count = 50; /* wait at most 5 seconds for completion */
 
+    if (p2p_supported) {
+        strcpy(supplicant_name, P2P_SUPPLICANT_NAME);
+        strcpy(supplicant_prop_name, P2P_PROP_NAME);
+    } else {
+        strcpy(supplicant_name, SUPPLICANT_NAME);
+        strcpy(supplicant_prop_name, SUPP_PROP_NAME);
+    }
+
     /* Check whether supplicant already stopped */
     if (property_get(supplicant_prop_name, supp_status, NULL)
         && strcmp(supp_status, "stopped") == 0) {
@@ -941,6 +949,7 @@ int wifi_stop_supplicant()
         }
         usleep(100000);
     }
+    ALOGE("Failed to stop supplicant");
     return -1;
 }