diff options
| author | zzy <zhenye@broadcom.com> | 2012-08-15 18:03:15 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-08-27 20:39:30 -0700 |
| commit | 54cdfabe7c0ed98732d0641ffe8b19ff7284e7d4 (patch) | |
| tree | e629044f6e72ed09807643e56b2a29a26993e1c7 /btif/src/btif_dm.c | |
| parent | be7063ce21ac1e2f67d489c29a1e979dc3d8f075 (diff) | |
| download | external_bluetooth_bluedroid-54cdfabe7c0ed98732d0641ffe8b19ff7284e7d4.zip external_bluetooth_bluedroid-54cdfabe7c0ed98732d0641ffe8b19ff7284e7d4.tar.gz external_bluetooth_bluedroid-54cdfabe7c0ed98732d0641ffe8b19ff7284e7d4.tar.bz2 | |
Added new storage code and bluez configuration migration support
Filter out hid device from bluez migration.
Change-Id: I8b5eb29f37ca37e97b728f69063266a1b0a61eb8
Conflicts:
main/Android.mk
Diffstat (limited to 'btif/src/btif_dm.c')
| -rwxr-xr-x | btif/src/btif_dm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index d31e1ca..31b6435 100755 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -830,7 +830,7 @@ static void btif_dm_search_devices_evt (UINT16 event, char *p_param) properties[0].type = BT_PROPERTY_BDNAME; properties[0].val = p_search_data->disc_res.bd_name; - properties[0].len = strlen((char *)p_search_data->disc_res.bd_name)+1; + properties[0].len = strlen((char *)p_search_data->disc_res.bd_name); bdcpy(bdaddr.address, p_search_data->disc_res.bd_addr); status = btif_storage_set_remote_device_property(&bdaddr, &properties[0]); @@ -900,7 +900,7 @@ static void btif_dm_search_devices_evt (UINT16 event, char *p_param) if (bdname.name[0]) { BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties], BT_PROPERTY_BDNAME, - strlen((char *)bdname.name)+1, &bdname); + strlen((char *)bdname.name), &bdname); num_properties++; } |