diff options
| author | Kausik Sinnaswamy <kausik@broadcom.com> | 2012-04-02 15:04:26 +0530 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-14 11:19:14 -0700 |
| commit | 84a000f59a48dac41d04da6bf9569258bc0e2cfc (patch) | |
| tree | 7552daf852870cf54ce7d6d9e1ad8f1ca83231c5 /btif/src | |
| parent | c01f69a35563261eca49bd2083afd7064790940d (diff) | |
| download | external_bluetooth_bluedroid-84a000f59a48dac41d04da6bf9569258bc0e2cfc.zip external_bluetooth_bluedroid-84a000f59a48dac41d04da6bf9569258bc0e2cfc.tar.gz external_bluetooth_bluedroid-84a000f59a48dac41d04da6bf9569258bc0e2cfc.tar.bz2 | |
Consolidated patchset for
1) Run-time configuration: configure stack and vendor at run-time using bt_stack.conf and bt_vendor.conf in /etc/bluetooth/
2) Build-time configuration: Auto-generate buildcfg.h header file from the target config bdroid_$(TARGET_DEVICE).txt file
Change-Id: Ieebb71081b7de404eab37f9ff4596d3dc94547a7
Diffstat (limited to 'btif/src')
| -rw-r--r-- | btif/src/btif_dm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index 6210a5f..40dcdc4 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -896,8 +896,7 @@ static void btif_dm_upstreams_evt(UINT16 event, char* p_param) */ if (status != BT_STATUS_SUCCESS) { - /* TODO: BTM_DEF_LOCAL_NAME should be configurable */ - BTA_DmSetDeviceName(BTM_DEF_LOCAL_NAME); + BTA_DmSetDeviceName((char *)BTM_DEF_LOCAL_NAME); /* Hmmm...Should we store this too??? */ } else @@ -1329,7 +1328,7 @@ bt_status_t btif_dm_get_adapter_property(bt_property_t *prop) case BT_PROPERTY_BDNAME: { bt_bdname_t *bd_name = (bt_bdname_t*)prop->val; - strcpy((char *)bd_name->name, BTM_DEF_LOCAL_NAME); + strcpy((char *)bd_name->name, (char *)BTM_DEF_LOCAL_NAME); prop->len = strlen((char *)bd_name->name)+1; } break; |