diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-22 05:39:14 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-09-22 05:39:14 -0700 |
| commit | 2c79865239c0dd9fbdd2095eaa6428d1992d9abd (patch) | |
| tree | b599db05083091b603dc713734f3d6f41246a05d | |
| parent | 140d83487f616d97120696140483640d420d3954 (diff) | |
| parent | 4b5b2c3ba221bf9b8828c3370e7443f061c596a8 (diff) | |
| download | android_hardware_qcom_bt-2c79865239c0dd9fbdd2095eaa6428d1992d9abd.tar.gz android_hardware_qcom_bt-2c79865239c0dd9fbdd2095eaa6428d1992d9abd.tar.bz2 android_hardware_qcom_bt-2c79865239c0dd9fbdd2095eaa6428d1992d9abd.zip | |
Merge 4b5b2c3ba221bf9b8828c3370e7443f061c596a8 on remote branch
Change-Id: I5b60ac46801ac72cae52c040948c0988fed3db89
| -rw-r--r-- | libbt-vendor/include/bt_vendor_qcom.h | 1 | ||||
| -rw-r--r-- | libbt-vendor/src/bt_vendor_qcom.c | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libbt-vendor/include/bt_vendor_qcom.h b/libbt-vendor/include/bt_vendor_qcom.h index dd956cf..ac8d2fd 100644 --- a/libbt-vendor/include/bt_vendor_qcom.h +++ b/libbt-vendor/include/bt_vendor_qcom.h @@ -69,6 +69,7 @@ enum { BT_STATUS_FAIL, BT_STATUS_INVAL, BT_STATUS_NOMEM, + BT_STATUS_PROP_FAILURE, }; struct bt_qcom_struct { diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c index 09583d5..cceeb59 100644 --- a/libbt-vendor/src/bt_vendor_qcom.c +++ b/libbt-vendor/src/bt_vendor_qcom.c @@ -585,7 +585,7 @@ static inline void print_bdaddr(unsigned char *addr) static int init(const bt_vendor_callbacks_t *cb, unsigned char *bdaddr) { - char address[PROPERTY_VALUE_MAX]; + char prop[PROPERTY_VALUE_MAX] = {0}; struct bt_qcom_struct *temp = NULL; int ret = BT_STATUS_SUCCESS, i; @@ -611,8 +611,18 @@ static int init(const bt_vendor_callbacks_t *cb, unsigned char *bdaddr) temp->ant_fd = -1; temp->soc_type = get_bt_soc_type(); soc_init(temp->soc_type); + le2bd(bdaddr, temp->bdaddr); print_bdaddr(temp->bdaddr); + snprintf(prop, sizeof(prop), "%02x:%02x:%02x:%02x:%02x:%02x", + temp->bdaddr[0], temp->bdaddr[1], temp->bdaddr[2], + temp->bdaddr[3], temp->bdaddr[4], temp->bdaddr[5]); + ret = property_set("wc_transport.stack_bdaddr", prop); + if (ret < 0) { + ALOGE("Failed to set wc_transport.stack_bdaddr prop, ret = %d", ret); + ret = -BT_STATUS_PROP_FAILURE; + goto out; + } /* TODO: Move these fields inside bt_qcom context */ #ifdef WIFI_BT_STATUS_SYNC |