commit 3a2c94bc66ce3451ae8c22323655f57a67d0fd86
author Nitin Arora <niarora@codeaurora.org> Fri Jun 26 18:09:37 2015 -0700
committer Andre Eisenbach <eisenbach@google.com> Tue Jul 21 21:59:33 2015 -0700
tree 6c087a12167e9c4a010f706b5a3180e16b5bfe75
parent 192c95da2ac0826248a0d3dbb26edac06cad2ce5

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

system/btif/src/btif_dm.c

diff --git a/system/btif/src/btif_dm.c b/system/btif/src/btif_dm.c
index 1131c98..dcee736 100644
--- a/system/btif/src/btif_dm.c
+++ b/system/btif/src/btif_dm.c
@@ -1314,9 +1314,9 @@
             {
                 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,8 +1340,21 @@
                 /* DEV_TYPE */
 #if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
                 /* FixMe: Assumption is that bluetooth.h and BTE enums match */
-                dev_type = p_search_data->inq_res.device_type;
-                addr_type = p_search_data->inq_res.ble_addr_type;
+
+                /* 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;
 #endif