diff options
| author | Zhihai Xu <zhihaixu@google.com> | 2013-12-06 14:29:29 -0800 |
|---|---|---|
| committer | Zhihai Xu <zhihaixu@google.com> | 2014-03-11 10:59:05 -0700 |
| commit | ad73b9c59961a622a5ec09b22a23a93f4c7bda1b (patch) | |
| tree | 8700088f9843316e205096c9589bcbad00d24668 | |
| parent | b74fe9e2c9fc0939f5c18282c985622f20b78d2a (diff) | |
| download | bluedroid-ad73b9c59961a622a5ec09b22a23a93f4c7bda1b.tar.gz | |
DO NOT MERGE use bluetooth HID remote device name as input device name.
bug:12003067
Change-Id: I74e4921047a27ee79fa1e3cd58056fde2958e60f
| -rw-r--r-- | btif/src/btif_hh.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/btif/src/btif_hh.c b/btif/src/btif_hh.c index 1c64e3e..60153f3 100644 --- a/btif/src/btif_hh.c +++ b/btif/src/btif_hh.c @@ -935,9 +935,18 @@ static void btif_hh_upstreams_evt(UINT16 event, char* p_param) } { char *cached_name = NULL; - char name[] = "Broadcom Bluetooth HID"; - if (cached_name == NULL) { - cached_name = name; + bt_bdname_t bdname; + bt_property_t prop_name; + BTIF_STORAGE_FILL_PROPERTY(&prop_name, BT_PROPERTY_BDNAME, + sizeof(bt_bdname_t), &bdname); + if (btif_storage_get_remote_device_property( + &p_dev->bd_addr, &prop_name) == BT_STATUS_SUCCESS) + { + cached_name = (char *)bdname.name; + } + else + { + cached_name = "Bluetooth HID"; } BTIF_TRACE_WARNING2("%s: name = %s", __FUNCTION__, cached_name); |