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

Commit f0ae4e9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Do not store anonymous address types into device record" am:... 

Merge "legacy: Do not store anonymous address types into device record" am: 6b76940b am: 4879ab38 am: 2a1dd7ae

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



Change-Id: Ied8cc9bb3120e326440473cda643c6242ce3dd0e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb520c07 2a1dd7ae

system/stack/btm/btm_ble.cc

+17 −3
Original line number Diff line number Diff line
@@ -89,7 +89,11 @@ void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type, 
  memset(p_dev_rec->sec_bd_name, 0, sizeof(tBTM_BD_NAME));



  p_dev_rec->device_type |= dev_type;

  if (is_ble_addr_type_known(addr_type))

    p_dev_rec->ble.SetAddressType(addr_type);

  else

    LOG_WARN(

        "Please do not update device record from anonymous le advertisement");



  /* sync up with the Inq Data base*/

  tBTM_INQ_INFO* p_info = BTM_InqDbRead(bd_addr);
@@ -481,7 +485,12 @@ void BTM_ReadDevInfo(const RawAddress& remote_bda, tBT_DEVICE_TYPE* p_dev_type, 
    /* new inquiry result, overwrite device type in security device record */

    if (p_inq_info) {

      p_dev_rec->device_type = p_inq_info->results.device_type;

      if (is_ble_addr_type_known(p_inq_info->results.ble_addr_type))

        p_dev_rec->ble.SetAddressType(p_inq_info->results.ble_addr_type);

      else

        LOG_WARN(

            "Please do not update device record from anonymous le "

            "advertisement");

    }



    if (p_dev_rec->bd_addr == remote_bda &&
@@ -1713,7 +1722,12 @@ void btm_ble_connected(const RawAddress& bda, uint16_t handle, uint8_t enc_mode, 
    p_dev_rec->timestamp = btm_cb.dev_rec_count++;

  }



  if (is_ble_addr_type_known(addr_type))

    p_dev_rec->ble.SetAddressType(addr_type);

  else

    LOG_WARN(

        "Please do not update device record from anonymous le advertisement");



  p_dev_rec->ble.pseudo_addr = bda;

  p_dev_rec->ble_hci_handle = handle;

  p_dev_rec->device_type |= BT_DEVICE_TYPE_BLE;

system/stack/btm/btm_dev.cc

+6 −1
Original line number Diff line number Diff line
@@ -237,7 +237,12 @@ tBTM_SEC_DEV_REC* btm_sec_alloc_dev(const RawAddress& bd_addr) { 
    memcpy(p_dev_rec->dev_class, p_inq_info->results.dev_class, DEV_CLASS_LEN);



    p_dev_rec->device_type = p_inq_info->results.device_type;

    if (is_ble_addr_type_known(p_inq_info->results.ble_addr_type))

      p_dev_rec->ble.SetAddressType(p_inq_info->results.ble_addr_type);

    else

      LOG_WARN(

          "Please do not update device record from anonymous le advertisement");



  } else if (bd_addr == btm_cb.connecting_bda)

    memcpy(p_dev_rec->dev_class, btm_cb.connecting_dc, DEV_CLASS_LEN);