diff options
| author | Colin Cross <ccross@android.com> | 2013-06-17 18:21:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-17 18:21:38 -0700 |
| commit | 248c9aa92c8f3e2f33a0e8a02436ea366266495f (patch) | |
| tree | 3324bab357dad52e293efa9b7f6c1934aee94bd9 | |
| parent | 66707435156d8d99d795271a7bd54943065b4c2d (diff) | |
| parent | 2769ce79def80023e454708deec176e3259dc586 (diff) | |
| download | libhardware_legacy-248c9aa92c8f3e2f33a0e8a02436ea366266495f.tar.gz | |
am 2769ce79: Merge "Use accessor to read property serial numbers"
* commit '2769ce79def80023e454708deec176e3259dc586':
Use accessor to read property serial numbers
| -rw-r--r-- | wifi/wifi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/wifi.c b/wifi/wifi.c index 30933fe..01d1d23 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -581,7 +581,7 @@ int wifi_start_supplicant(int p2p_supported) */ pi = __system_property_find(supplicant_prop_name); if (pi != NULL) { - serial = pi->serial; + serial = __system_property_serial(pi); } #endif property_get("wifi.interface", primary_iface, WIFI_TEST_INTERFACE); @@ -598,7 +598,7 @@ int wifi_start_supplicant(int p2p_supported) __system_property_read(pi, NULL, supp_status); if (strcmp(supp_status, "running") == 0) { return 0; - } else if (pi->serial != serial && + } else if (__system_property_serial(pi) != serial && strcmp(supp_status, "stopped") == 0) { return -1; } |