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

Commit 01236b61 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Corrected the incorrect log placement." into main am: 92f95470 am: 44cf6105 

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



Change-Id: I07baf2a8eea735755ea550ecfb1fb8a821f22018
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50c73f8b 44cf6105

system/stack/btm/btm_dev.cc

+9 −5
Original line number Diff line number Diff line
@@ -685,12 +685,16 @@ std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec() { 
bool BTM_Sec_AddressKnown(const RawAddress& address) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(address);



  //  not a known device, or a classic device, we assume public address

  if (p_dev_rec == NULL || (p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) == 0)

  // not a known device, we assume public address

  if (p_dev_rec == NULL) {

    log::warn("{}, unknown device", address);

    return true;



  log::warn("{}, device type not BLE: 0x{:02x}", address,

            p_dev_rec->device_type);

  }

  // a classic device, we assume public address

  if ((p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) == 0) {

    log::warn("{}, device type not BLE: 0x{:02x}", address, p_dev_rec->device_type);

    return true;

  }



  // bonded device with identity address known

  if (!p_dev_rec->ble.identity_address_with_type.bda.IsEmpty()) {