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

Commit 2280dd51 authored by Henri Chataing's avatar Henri Chataing
Browse files

Remove PRIVATE_NAME 

not implemented

Bug: 331817295
Test: m com.android.bt
Flag: EXEMPT, no logical change
Change-Id: If765cc42665f64e0c3ddd9218e6045614a5b8606
parent 77321e97

system/bta/dm/bta_dm_device_search.cc

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static void bta_dm_remote_name_cmpl(const tBTA_DM_REMOTE_NAME& remote_name_msg) 
                 std::format("status:{} state:{} name:\"{}\"",

                             hci_status_code_text(remote_name_msg.hci_status),

                             bta_dm_state_text(bta_dm_search_get_state()),

                             PRIVATE_NAME(reinterpret_cast<char const*>(remote_name_msg.bd_name))));

                             reinterpret_cast<char const*>(remote_name_msg.bd_name)));



  tBTM_INQ_INFO* p_btm_inq_info =

          get_btm_client_interface().db.BTM_InqDbRead(remote_name_msg.bd_addr);

system/btif/src/btif_dm.cc

+6 −8
Original line number Diff line number Diff line
@@ -970,9 +970,8 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { 
    }

  }

  BTM_LogHistory(kBtmLogTagCallback, bd_addr, "Pin request",

                 std::format("name:\"{}\" min16:{:c}",

                             PRIVATE_NAME(reinterpret_cast<char const*>(bd_name.name)),

                             (p_pin_req->min_16_digit) ? 'T' : 'F'));

                 std::format("name:\"{}\" min16:{:c}", reinterpret_cast<char const*>(bd_name.name),

                             p_pin_req->min_16_digit ? 'T' : 'F'));

  GetInterfaceToProfiles()->events->invoke_pin_request_cb(bd_addr, bd_name, cod,

                                                          p_pin_req->min_16_digit);

}
@@ -1859,7 +1858,7 @@ static void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, co 
  GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb(

          status, bd_addr, properties.size(), properties.data());

  log::info("Callback for read name event addr:{} name:{}", bd_addr,

            PRIVATE_NAME(reinterpret_cast<char const*>(bd_name)));

            reinterpret_cast<char const*>(bd_name));



  if (!during_device_search) {

    return;
@@ -1873,7 +1872,7 @@ static void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, co 
    GetInterfaceToProfiles()->events->invoke_device_found_cb(properties.size(), properties.data());

  } else {

    log::info("Skipping device found callback because cod is zero addr:{} name:{}", bd_addr,

              PRIVATE_NAME(reinterpret_cast<char const*>(bd_name)));

              reinterpret_cast<char const*>(bd_name));

  }

}
@@ -3563,9 +3562,8 @@ static void btif_dm_ble_passkey_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { 


  cod = COD_UNCLASSIFIED;



  BTM_LogHistory(

          kBtmLogTagCallback, bd_addr, "PIN request",

          std::format("name:'{}'", PRIVATE_NAME(reinterpret_cast<char const*>(bd_name.name))));

  BTM_LogHistory(kBtmLogTagCallback, bd_addr, "PIN request",

                 std::format("name:'{}'", reinterpret_cast<char const*>(bd_name.name)));



  GetInterfaceToProfiles()->events->invoke_pin_request_cb(bd_addr, bd_name, cod, false);

}

system/gd/os/logging/log_adapter.h

+0 −2
Original line number Diff line number Diff line
@@ -24,5 +24,3 @@ 
  (number.replace(0, (number.size() > 2) ? number.size() - 2 : 0,   \

                  (number.size() > 2) ? number.size() - 2 : 0, '*') \

           .c_str())
 


#define PRIVATE_NAME(name) (name)

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -2167,7 +2167,7 @@ tBTM_SEC_DEV_REC* btm_rnr_add_name_to_security_record(const RawAddress* p_bd_add 


  BTM_LogHistory(kBtmLogTag, (p_bd_addr) ? *p_bd_addr : RawAddress::kEmpty, "RNR complete",

                 std::format("hci_status:{} name:{}", hci_error_code_text(hci_status),

                             PRIVATE_NAME(reinterpret_cast<char const*>(p_bd_name))));

                             reinterpret_cast<char const*>(p_bd_name)));



  if (p_dev_rec == nullptr) {

    // We need to send the callbacks to complete the RNR cycle despite failure

system/stack/btm/security_device_record.h

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ public: 
            "name:\"{}\" sec_prop:{}",

            bd_addr, DeviceTypeText(device_type), dev_class_text(dev_class),

            remote_version_info.ToString(), sm4, remote_supports_secure_connections ? 'T' : 'F',

            PRIVATE_NAME(reinterpret_cast<char const*>(sec_bd_name)), sec_rec.ToString());

            reinterpret_cast<char const*>(sec_bd_name), sec_rec.ToString());

  }



public: