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

Commit 3a2c94bc authored by Nitin Arora's avatar Nitin Arora Committed by Andre Eisenbach
Browse files

Update device type correctly in the NVRAM at inquiry result 

This patch checks for the NVRAM data when inquiry result
is received from the remote device. In case the device is
marked as LE only or BR/EDR only, and inquiry result is
received from the alternate transport, the device type is
marked as Dual mode in the NVRAM

Bug: 22604450
Change-Id: Id925e8bad152a33c2bd3c371ca42a6f9c694e3b0
parent 192c95da

system/btif/src/btif_dm.c

+16 −3
Original line number Diff line number Diff line
@@ -1314,9 +1314,9 @@ static void btif_dm_search_devices_evt (UINT16 event, char *p_param) 
            {

                bt_property_t properties[5];

                bt_device_type_t dev_type;

                UINT8 addr_type;

                uint32_t num_properties = 0;

                bt_status_t status;

                int addr_type = 0;



                memset(properties, 0, sizeof(properties));

                /* BD_ADDR */
@@ -1340,7 +1340,20 @@ static void btif_dm_search_devices_evt (UINT16 event, char *p_param) 
                /* DEV_TYPE */

#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))

                /* FixMe: Assumption is that bluetooth.h and BTE enums match */



                /* Verify if the device is dual mode in NVRAM */

                int stored_device_type = 0;

                if (btif_get_device_type(bdaddr.address, &stored_device_type) &&

                    ((stored_device_type == BT_DEVICE_TYPE_BLE &&

                        p_search_data->inq_res.device_type == BT_DEVICE_TYPE_BREDR) ||

                     (stored_device_type == BT_DEVICE_TYPE_BREDR &&

                        p_search_data->inq_res.device_type == BT_DEVICE_TYPE_BLE))) {

                    dev_type = BT_DEVICE_TYPE_DUMO;

                } else {

                    dev_type = p_search_data->inq_res.device_type;

                }



                if (p_search_data->inq_res.device_type == BT_DEVICE_TYPE_BLE)

                    addr_type = p_search_data->inq_res.ble_addr_type;

#else

                dev_type = BT_DEVICE_TYPE_BREDR;