diff options
| author | Colin Cross <ccross@android.com> | 2013-06-18 01:11:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-18 01:11:57 +0000 |
| commit | 2769ce79def80023e454708deec176e3259dc586 (patch) | |
| tree | 8a196ed3377082bffe0d7301e183d2830b268fee | |
| parent | 8d674a4b6f4300df90415889c2f57fe8b383e867 (diff) | |
| parent | 28429ee0d732a9dbb21dfc1bbf66ae0b01b2b9ce (diff) | |
| download | libhardware_legacy-jb-mr1.1-dev-plus-aosp.tar.gz | |
Merge "Use accessor to read property serial numbers"jb-mr1.1-dev-plus-aosp
| -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 b905897..818c212 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -571,7 +571,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); @@ -588,7 +588,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; } |