Skip to content

Commit

Permalink
Remove BleAdvertiser::ServiceDataInHex(). This method was redundant a…
Browse files Browse the repository at this point in the history
…nd actually printed incorrectly on 64-bit machines.

BUG=672263

Review-Url: https://codereview.chromium.org/2902053002
Cr-Commit-Position: refs/heads/master@{#474099}
  • Loading branch information
hansberry authored and Commit bot committed May 23, 2017
1 parent c9da424 commit 500e7f0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
16 changes: 3 additions & 13 deletions chromeos/components/tether/ble_advertiser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,15 @@ void BleAdvertiser::IndividualAdvertisement::OnAdvertisementRegisteredCallback(
is_initializing_advertising_ = false;
advertisement_ = advertisement;
PA_LOG(INFO) << "Advertisement registered. "
<< "Service data: " << ServiceDataInHex() << ".";
<< "Service data: " << advertisement_data_->DataInHex() << ".";
}

void BleAdvertiser::IndividualAdvertisement::OnAdvertisementErrorCallback(
device::BluetoothAdvertisement::ErrorCode error_code) {
is_initializing_advertising_ = false;
PA_LOG(WARNING) << "Error registering advertisement. "
<< "Service data: " << ServiceDataInHex() << ", "
<< "Service data: " << advertisement_data_->DataInHex()
<< ", "
<< "Error code: " << error_code;
}

Expand Down Expand Up @@ -138,17 +139,6 @@ BleAdvertiser::IndividualAdvertisement::CreateServiceData() const {
return service_data;
}

std::string BleAdvertiser::IndividualAdvertisement::ServiceDataInHex() const {
std::stringstream ss;
ss << "0x" << std::hex;

for (size_t i = 0; i < advertisement_data_->data.size(); i++) {
ss << static_cast<int>(advertisement_data_->data.data()[i]);
}

return ss.str();
}

BleAdvertiser::BleAdvertiser(
scoped_refptr<device::BluetoothAdapter> adapter,
const LocalDeviceDataProvider* local_device_data_provider,
Expand Down
2 changes: 0 additions & 2 deletions chromeos/components/tether/ble_advertiser.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ class BleAdvertiser {
std::unique_ptr<device::BluetoothAdvertisement::ServiceData>
CreateServiceData() const;

std::string ServiceDataInHex() const;

scoped_refptr<device::BluetoothAdapter> adapter_;
bool is_initializing_advertising_;
std::unique_ptr<cryptauth::DataWithTimestamp> advertisement_data_;
Expand Down

0 comments on commit 500e7f0

Please sign in to comment.