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

Commit 99af5adf authored by Archie Pusaka's avatar Archie Pusaka Committed by Automerger Merge Worker
Browse files

Merge "Fix data type when querying remote_dev type" into main am: 94882978... 

Merge "Fix data type when querying remote_dev type" into main am: 94882978 am: e04eed4e am: 5a63072e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2774504



Change-Id: I1a0edebb2ac9cc089eea8959cf834f0acfdff256
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09392796 5a63072e

system/btif/src/btif_dm.cc

+6 −6
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static void btif_update_remote_properties(const RawAddress& bdaddr, 
  bt_property_t properties[3];

  bt_status_t status = BT_STATUS_UNHANDLED;

  uint32_t cod;

  bt_device_type_t dev_type;

  uint32_t dev_type;



  memset(properties, 0, sizeof(properties));
@@ -708,14 +708,14 @@ static void btif_update_remote_properties(const RawAddress& bdaddr, 


  /* device type */

  bt_property_t prop_name;

  uint8_t remote_dev_type;

  uint32_t remote_dev_type;

  BTIF_STORAGE_FILL_PROPERTY(&prop_name, BT_PROPERTY_TYPE_OF_DEVICE,

                             sizeof(uint8_t), &remote_dev_type);

                             sizeof(uint32_t), &remote_dev_type);

  if (btif_storage_get_remote_device_property(&bdaddr, &prop_name) ==

      BT_STATUS_SUCCESS) {

    dev_type = (bt_device_type_t)(remote_dev_type | device_type);

    dev_type = remote_dev_type | device_type;

  } else {

    dev_type = (bt_device_type_t)device_type;

    dev_type = device_type;

  }



  BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties],
@@ -1452,7 +1452,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, 


      {

        bt_property_t properties[10];  // increase when properties are added

        bt_device_type_t dev_type;

        uint32_t dev_type;

        uint32_t num_properties = 0;

        bt_status_t status;

        tBLE_ADDR_TYPE addr_type = BLE_ADDR_PUBLIC;

system/btif/src/btif_iot_config.cc

+2 −2
Original line number Diff line number Diff line
@@ -110,9 +110,9 @@ void btif_iot_update_remote_info(tBTA_DM_AUTH_CMPL* p_auth_cmpl, bool is_ble, 


  // save remote dev type to iot conf file

  bt_device_type_t dev_type;

  uint8_t remote_dev_type;

  uint32_t remote_dev_type;

  BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties],

                             BT_PROPERTY_TYPE_OF_DEVICE, sizeof(uint8_t),

                             BT_PROPERTY_TYPE_OF_DEVICE, sizeof(uint32_t),

                             &remote_dev_type);

  if (btif_storage_get_remote_device_property(&p_auth_cmpl->bd_addr,

                                              &properties[num_properties]) ==