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

Commit 21d3eac2 authored by Hui Peng's avatar Hui Peng
Browse files

Rename is_empty -> is_oob_data_empty 

To avoid name conflict with std::is_empty

Bug: 301661850
Test: m com.android.btservices
Flag: EXEMPT, no-op
Change-Id: I8376ac58546ae668941f3b4390b40f418a36da2c
parent 5907866a

system/stack/smp/smp_keys.cc

+6 −4
Original line number Diff line number Diff line
@@ -68,12 +68,14 @@ void smp_save_local_oob_data(tSMP_CB* p_cb) { 


void smp_clear_local_oob_data() { saved_local_oob_data = {}; }



static bool is_empty(tSMP_LOC_OOB_DATA* data) {

static bool is_oob_data_empty(tSMP_LOC_OOB_DATA* data) {

  tSMP_LOC_OOB_DATA empty_data = {};

  return memcmp(data, &empty_data, sizeof(tSMP_LOC_OOB_DATA)) == 0;

}



bool smp_has_local_oob_data() { return !is_empty(&saved_local_oob_data); }

bool smp_has_local_oob_data() {

  return !is_oob_data_empty(&saved_local_oob_data);

}



void smp_debug_print_nbyte_little_endian(uint8_t* p, const char* key_name,

                                         uint8_t len) {}
@@ -606,7 +608,7 @@ void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
    // pairing will fail Not much we can do about it at this point, just have to

    // generate new data The data will be cleared after the advertiser times

    // out, so if the advertiser times out we want the pairing to fail anyway.

    if (!is_empty(&saved_local_oob_data)) {

    if (!is_oob_data_empty(&saved_local_oob_data)) {

      LOG_WARN("Found OOB data, loading keys");

      for (int i = 0; i < BT_OCTET32_LEN; i++) {

        p_cb->private_key[i] = saved_local_oob_data.private_key_used[i];
@@ -676,7 +678,7 @@ void smp_use_oob_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
        // point, just have to generate new data The data will be cleared after

        // the advertiser times out, so if the advertiser times out we want the

        // pairing to fail anyway.

        if (!is_empty(&saved_local_oob_data)) {

        if (!is_oob_data_empty(&saved_local_oob_data)) {

          LOG_INFO("Found OOB data, loading keys");

          for (int i = 0; i < BT_OCTET32_LEN; i++) {

            p_cb->private_key[i] = saved_local_oob_data.private_key_used[i];