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

Commit bea3572c authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[redact_log] redact logging addresses in btif" am: 082badd5 

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



Change-Id: Idbf8f68ca649f703538ddb7b7ac9998afa4b2ca8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bfaeb937 082badd5

system/btif/src/btif_storage.cc

+6 −5
Original line number Diff line number Diff line
@@ -478,7 +478,8 @@ static bt_status_t btif_in_fetch_bonded_devices( 
    }

    if (!btif_in_fetch_bonded_ble_device(name, add, p_bonded_devices) &&

        !bt_linkkey_file_found) {

      LOG_VERBOSE("No link key or ble key found for device:%s", name.c_str());

      LOG_VERBOSE("No link key or ble key found for device:%s",

                  ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

    }

  }

  return BT_STATUS_SUCCESS;
@@ -1366,6 +1367,9 @@ bt_status_t btif_in_fetch_bonded_ble_device( 
  tBLE_ADDR_TYPE addr_type;

  bool device_added = false;

  bool key_found = false;

  RawAddress bd_addr;



  RawAddress::FromString(remote_bd_addr, bd_addr);



  if (!btif_config_get_int(remote_bd_addr, "DevType", &device_type))

    return BT_STATUS_FAIL;
@@ -1373,10 +1377,7 @@ bt_status_t btif_in_fetch_bonded_ble_device( 
  if ((device_type & BT_DEVICE_TYPE_BLE) == BT_DEVICE_TYPE_BLE ||

      btif_has_ble_keys(remote_bd_addr)) {

    BTIF_TRACE_DEBUG("%s Found a LE device: %s", __func__,

                     remote_bd_addr.c_str());



    RawAddress bd_addr;

    RawAddress::FromString(remote_bd_addr, bd_addr);

                     ADDRESS_TO_LOGGABLE_CSTR(bd_addr));



    if (btif_storage_get_remote_addr_type(&bd_addr, &addr_type) !=

        BT_STATUS_SUCCESS) {