Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(762)

Unified Diff: components/proximity_auth/proximity_monitor_impl.cc

Issue 1941923002: bluetooth: Return int8_t and use -128 for unknown tx power. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Fix extensions tests Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/proximity_auth/proximity_monitor_impl.cc
diff --git a/components/proximity_auth/proximity_monitor_impl.cc b/components/proximity_auth/proximity_monitor_impl.cc
index e6d8d7b2c01413eaae8acf6cdcec6508303b93ed..224e43252c19a64509983dd448097e109e584fcf 100644
--- a/components/proximity_auth/proximity_monitor_impl.cc
+++ b/components/proximity_auth/proximity_monitor_impl.cc
@@ -204,15 +204,11 @@ void ProximityMonitorImpl::OnConnectionInfo(
return;
}
- if (connection_info.rssi != BluetoothDevice::kUnknownPower &&
- connection_info.transmit_power != BluetoothDevice::kUnknownPower &&
- connection_info.max_transmit_power != BluetoothDevice::kUnknownPower) {
+ if (connection_info.rssi && connection_info.transmit_power &&
+ connection_info.max_transmit_power) {
AddSample(connection_info);
} else {
- PA_LOG(WARNING) << "[Proximity] Unkown values received from API: "
- << connection_info.rssi << " "
- << connection_info.transmit_power << " "
- << connection_info.max_transmit_power;
+ PA_LOG(WARNING) << "[Proximity] Unkown values received from API.";
rssi_rolling_average_.reset();
last_transmit_power_reading_.reset();
CheckForProximityStateChange();
@@ -235,16 +231,17 @@ void ProximityMonitorImpl::AddSample(
const BluetoothDevice::ConnectionInfo& connection_info) {
double weight = kRssiSampleWeight;
if (!rssi_rolling_average_) {
- rssi_rolling_average_.reset(new double(connection_info.rssi));
+ rssi_rolling_average_.reset(new double(connection_info.rssi.value()));
} else {
- *rssi_rolling_average_ =
- weight * connection_info.rssi + (1 - weight) * (*rssi_rolling_average_);
+ *rssi_rolling_average_ = weight * connection_info.rssi.value() +
+ (1 - weight) * (*rssi_rolling_average_);
}
- last_transmit_power_reading_.reset(new TransmitPowerReading(
- connection_info.transmit_power, connection_info.max_transmit_power));
+ last_transmit_power_reading_.reset(
+ new TransmitPowerReading(connection_info.transmit_power.value(),
+ connection_info.max_transmit_power.value()));
// It's rare but possible for the RSSI to be positive briefly.
- if (connection_info.rssi >= 0)
+ if (connection_info.rssi.value() >= 0)
last_zero_rssi_timestamp_.reset(new base::TimeTicks(clock_->NowTicks()));
CheckForProximityStateChange();

Powered by Google App Engine
This is Rietveld 408576698