am 2769ce79: Merge "Use accessor to read property serial numbers"

* commit '2769ce79def80023e454708deec176e3259dc586':
  Use accessor to read property serial numbers
This commit is contained in:
Colin Cross 2013-06-17 18:21:38 -07:00 committed by Android Git Automerger
commit 248c9aa92c

View file

@ -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;
}