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

Commit 90e09f17 authored by Josh Wu's avatar Josh Wu Committed by Automerger Merge Worker
Browse files

Merge "BLE: Do not rewrite devtype in BTM_ReadDevInfo()" am: 6b43345f 

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



Change-Id: I100c840f1fc42fcb52c3f3ce6b18acdc622901d7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a5bd497 6b43345f

system/stack/btm/btm_ble.cc

+2 −2
Original line number Diff line number Diff line
@@ -517,9 +517,9 @@ void BTM_ReadDevInfo(const RawAddress& remote_bda, tBT_DEVICE_TYPE* p_dev_type, 
    }

  } else /* there is a security device record exisitng */

  {

    /* new inquiry result, overwrite device type in security device record */

    /* new inquiry result, merge device type in security device record */

    if (p_inq_info) {

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

      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