Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ce81072 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 772a3610: Merge "DO NOT MERGE use bluetooth HID remote device name as input... 

am 772a3610: Merge "DO NOT MERGE use bluetooth HID remote device name as input device name." into klp-dev

* commit '772a3610':
  DO NOT MERGE use bluetooth HID remote device name as input device name.
parents f3f8c6eb 772a3610

system/btif/src/btif_hh.c

+12 −3
Original line number Diff line number Diff line
@@ -938,9 +938,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);