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

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

Merge "Replace Log Statements in system/main" am: 4c46bdb3 am: 403c52be 

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



Change-Id: I2669440e1fa3a907a3066b7c638bc0958153e7fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9160e25e 403c52be

system/main/shim/acl.cc

+7 −6
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ struct shim::legacy::Acl::impl { 
              acceptlist.size(),

              controller_get_interface()->get_ble_acceptlist_size());

    for (auto& entry : acceptlist) {

      LOG_DEBUG("acceptlist:%s", entry.ToString().c_str());

      LOG_DEBUG("acceptlist:%s", ADDRESS_TO_LOGGABLE_CSTR(entry));

    }

  }
@@ -1139,7 +1139,7 @@ struct shim::legacy::Acl::impl { 
                controller_get_interface()->get_ble_acceptlist_size());

    unsigned cnt = 0;

    for (auto& entry : acceptlist) {

      LOG_DUMPSYS(fd, "  %03u %s", ++cnt, entry.ToString().c_str());

      LOG_DUMPSYS(fd, "  %03u %s", ++cnt, ADDRESS_TO_LOGGABLE_CSTR(entry));

    }

    auto address_resolution_list = shadow_address_resolution_list_.GetCopy();

    LOG_DUMPSYS(fd,
@@ -1149,7 +1149,7 @@ struct shim::legacy::Acl::impl { 
                controller_get_interface()->get_ble_resolving_list_max_size());

    cnt = 0;

    for (auto& entry : address_resolution_list) {

      LOG_DUMPSYS(fd, "  %03u %s", ++cnt, entry.ToString().c_str());

      LOG_DUMPSYS(fd, "  %03u %s", ++cnt, ADDRESS_TO_LOGGABLE_CSTR(entry));

    }

  }

#undef DUMPSYS_TAG
@@ -1192,7 +1192,7 @@ void DumpsysAcl(int fd) { 
    if (!link.in_use) continue;



    LOG_DUMPSYS(fd, "remote_addr:%s handle:0x%04x transport:%s",

                link.remote_addr.ToString().c_str(), link.hci_handle,

                ADDRESS_TO_LOGGABLE_CSTR(link.remote_addr), link.hci_handle,

                bt_transport_text(link.transport).c_str());

    LOG_DUMPSYS(fd, "    link_up_issued:%5s",

                (link.link_up_issued) ? "true" : "false");
@@ -1224,10 +1224,10 @@ void DumpsysAcl(int fd) { 
                  bd_features_text(link.peer_le_features).c_str());



      LOG_DUMPSYS(fd, "    [le] active_remote_addr:%s[%s]",

                  link.active_remote_addr.ToString().c_str(),

                  ADDRESS_TO_LOGGABLE_CSTR(link.active_remote_addr),

                  AddressTypeText(link.active_remote_addr_type).c_str());

      LOG_DUMPSYS(fd, "    [le] conn_addr:%s[%s]",

                  link.conn_addr.ToString().c_str(),

                  ADDRESS_TO_LOGGABLE_CSTR(link.conn_addr),

                  AddressTypeText(link.conn_addr_type).c_str());

    }

  }
@@ -1270,6 +1270,7 @@ void DumpsysRecord(int fd) { 
       node = list_next(node)) {

    tBTM_SEC_DEV_REC* p_dev_rec =

        static_cast<tBTM_SEC_DEV_REC*>(list_node(node));

    // TODO: handle in tBTM_SEC_DEV_REC.ToString

    LOG_DUMPSYS(fd, "%03u %s", ++cnt, p_dev_rec->ToString().c_str());

  }

}

system/main/shim/btm.cc

+3 −3
Original line number Diff line number Diff line
@@ -490,12 +490,12 @@ BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& raw_address, 


  if (!classic_read_remote_name_.Start(raw_address)) {

    LOG_INFO("%s Read remote name is currently busy address:%s", __func__,

             raw_address.ToString().c_str());

             ADDRESS_TO_LOGGABLE_CSTR(raw_address));

    return BTM_BUSY;

  }



  LOG_INFO("%s Start read name from address:%s", __func__,

           raw_address.ToString().c_str());

           ADDRESS_TO_LOGGABLE_CSTR(raw_address));

  GetName()->ReadRemoteNameRequest(

      ToGdAddress(raw_address), hci::PageScanRepetitionMode::R1,

      0 /* clock_offset */, hci::ClockOffsetValid::INVALID,
@@ -516,7 +516,7 @@ BtmStatus Btm::ReadClassicRemoteDeviceName(const RawAddress& raw_address, 
            std::copy(remote_name.begin(), remote_name.end(),

                      name.remote_bd_name);

            LOG_INFO("%s Finish read name from address:%s name:%s", __func__,

                     address.ToString().c_str(), name.remote_bd_name);

                     ADDRESS_TO_LOGGABLE_CSTR(address), name.remote_bd_name);

            callback(&name);

            classic_read_remote_name->Stop();

          },

system/main/shim/controller.cc

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static future_t* start_up(void) { 
    data_.le_supported_states =

        bluetooth::shim::rust::controller_get_le_supported_states(**controller);



    LOG_INFO("Mac address:%s", string_address.c_str());

    LOG_INFO("Mac address:%s", ADDRESS_TO_LOGGABLE_CSTR(data_.raw_address));

  } else {

    std::string string_address = GetController()->GetMacAddress().ToString();

    RawAddress::FromString(string_address, data_.raw_address);
@@ -96,7 +96,7 @@ static future_t* start_up(void) { 
    data_.bt_version.lmp_subversion = local_version_info.lmp_subversion_;

    data_.bt_version.manufacturer = local_version_info.manufacturer_name_;



    LOG_INFO("Mac address:%s", string_address.c_str());

    LOG_INFO("Mac address:%s", ADDRESS_TO_LOGGABLE_CSTR(data_.raw_address));

  }



  data_.phy = kPhyLe1M;

system/main/shim/l2c_api.cc

+6 −4
Original line number Diff line number Diff line
@@ -807,14 +807,15 @@ bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& bd_addr, 
                                      std::vector<uint16_t>& lcids,

                                      tL2CAP_LE_CFG_INFO* p_cfg) {

  LOG_INFO("UNIMPLEMENTED %s addr: %s cfg:%p", __func__,

           bd_addr.ToString().c_str(), p_cfg);

           ADDRESS_TO_LOGGABLE_CSTR(bd_addr), p_cfg);

  return false;

}



std::vector<uint16_t> L2CA_ConnectCreditBasedReq(uint16_t psm,

                                                 const RawAddress& p_bd_addr,

                                                 tL2CAP_LE_CFG_INFO* p_cfg) {

  LOG_INFO("UNIMPLEMENTED %s addr:%s", __func__, p_bd_addr.ToString().c_str());

  LOG_INFO("UNIMPLEMENTED %s addr:%s", __func__,

           ADDRESS_TO_LOGGABLE_CSTR(p_bd_addr));

  std::vector<uint16_t> result;

  return result;

}
@@ -822,7 +823,8 @@ std::vector<uint16_t> L2CA_ConnectCreditBasedReq(uint16_t psm, 
bool L2CA_ConnectCreditBasedRsp(const RawAddress& bd_addr, uint8_t id,

                                std::vector<uint16_t>& accepted_lcids,

                                uint16_t result, tL2CAP_LE_CFG_INFO* p_cfg) {

  LOG_INFO("UNIMPLEMENTED %s addr:%s", __func__, bd_addr.ToString().c_str());

  LOG_INFO("UNIMPLEMENTED %s addr:%s", __func__,

           ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

  return false;

}
@@ -1013,7 +1015,7 @@ bool L2CA_ConnectFixedChnl(uint16_t cid, const RawAddress& rem_bda) { 
  if (record != le_link_property_listener_shim_.info_.end()) {

    remote = record->second.address_with_type;

  }

  LOG(ERROR) << __func__ << remote.ToString();

  LOG(ERROR) << __func__ << ADDRESS_TO_LOGGABLE_STR(remote);

  auto manager = GetL2capLeModule()->GetFixedChannelManager();

  manager->ConnectServices(

      remote,