diff options
| author | Elliott Hughes <enh@google.com> | 2015-01-12 21:50:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-12 21:50:01 +0000 |
| commit | 991234497a380c7168a3a303e4bb67029f56717e (patch) | |
| tree | c09cdc2c0070e969184bbd71e8e391b60703f9ff | |
| parent | 27b9f4b5bd44ef658c771cd4fb137c321c3527c6 (diff) | |
| parent | 82753d5ace78be86dddfb1babf9f3f897a76820f (diff) | |
| download | hardware_libhardware_legacy-991234497a380c7168a3a303e4bb67029f56717e.zip hardware_libhardware_legacy-991234497a380c7168a3a303e4bb67029f56717e.tar.gz hardware_libhardware_legacy-991234497a380c7168a3a303e4bb67029f56717e.tar.bz2 | |
am 82753d5a: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES."
* commit '82753d5ace78be86dddfb1babf9f3f897a76820f':
Remove HAVE_LIBC_SYSTEM_PROPERTIES.
| -rw-r--r-- | wifi/wifi.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/wifi/wifi.c b/wifi/wifi.c index 87be8d8..3e99715 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -34,10 +34,9 @@ #include "cutils/misc.h" #include "cutils/properties.h" #include "private/android_filesystem_config.h" -#ifdef HAVE_LIBC_SYSTEM_PROPERTIES + #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #include <sys/_system_properties.h> -#endif extern int do_dhcp(); extern int ifc_init(); @@ -405,10 +404,8 @@ int wifi_start_supplicant(int p2p_supported) { char supp_status[PROPERTY_VALUE_MAX] = {'\0'}; int count = 200; /* wait at most 20 seconds for completion */ -#ifdef HAVE_LIBC_SYSTEM_PROPERTIES const prop_info *pi; unsigned serial = 0, i; -#endif if (p2p_supported) { strcpy(supplicant_name, P2P_SUPPLICANT_NAME); @@ -447,7 +444,6 @@ int wifi_start_supplicant(int p2p_supported) /* Reset sockets used for exiting from hung state */ exit_sockets[0] = exit_sockets[1] = -1; -#ifdef HAVE_LIBC_SYSTEM_PROPERTIES /* * Get a reference to the status property, so we can distinguish * the case where it goes stopped => running => stopped (i.e., @@ -459,14 +455,12 @@ int wifi_start_supplicant(int p2p_supported) if (pi != NULL) { serial = __system_property_serial(pi); } -#endif property_get("wifi.interface", primary_iface, WIFI_TEST_INTERFACE); property_set("ctl.start", supplicant_name); sched_yield(); while (count-- > 0) { -#ifdef HAVE_LIBC_SYSTEM_PROPERTIES if (pi == NULL) { pi = __system_property_find(supplicant_prop_name); } @@ -483,12 +477,6 @@ int wifi_start_supplicant(int p2p_supported) } } } -#else - if (property_get(supplicant_prop_name, supp_status, NULL)) { - if (strcmp(supp_status, "running") == 0) - return 0; - } -#endif usleep(100000); } return -1; |