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

Unified Diff: device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc

Issue 2105423003: bluetooth: Update the map of GATT services when services resolve (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Address luiz's comments Created 4 years, 5 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: device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
diff --git a/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc b/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
index 12daa95a5e688d296592bb9c064ec85e55391215..3c5591d0ff26d7582a42b5f809ffe307c99e535a 100644
--- a/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_gatt_service_client.cc
@@ -19,8 +19,12 @@ namespace bluez {
// static
const char FakeBluetoothGattServiceClient::kHeartRateServicePathComponent[] =
"service0000";
+const char FakeBluetoothGattServiceClient::kBatteryServicePathComponent[] =
+ "service0001";
const char FakeBluetoothGattServiceClient::kHeartRateServiceUUID[] =
"0000180d-0000-1000-8000-00805f9b34fb";
+const char FakeBluetoothGattServiceClient::kBatteryServiceUUID[] =
+ "0000180f-0000-1000-8000-00805f9b34fb";
FakeBluetoothGattServiceClient::Properties::Properties(
const PropertyChangedCallback& callback)
@@ -70,6 +74,10 @@ std::vector<dbus::ObjectPath> FakeBluetoothGattServiceClient::GetServices() {
DCHECK(!heart_rate_service_path_.empty());
paths.push_back(dbus::ObjectPath(heart_rate_service_path_));
}
+ if (battery_service_properties_.get()) {
+ DCHECK(!battery_service_path_.empty());
+ paths.push_back(dbus::ObjectPath(battery_service_path_));
+ }
return paths;
}
@@ -78,6 +86,8 @@ FakeBluetoothGattServiceClient::GetProperties(
const dbus::ObjectPath& object_path) {
if (object_path.value() == heart_rate_service_path_)
return heart_rate_service_properties_.get();
+ if (object_path.value() == battery_service_path_)
+ return battery_service_properties_.get();
return NULL;
}
@@ -98,19 +108,13 @@ void FakeBluetoothGattServiceClient::ExposeHeartRateService(
heart_rate_service_properties_->device.ReplaceValue(device_path);
heart_rate_service_properties_->primary.ReplaceValue(true);
- NotifyServiceAdded(dbus::ObjectPath(heart_rate_service_path_));
+ NotifyServiceAdded(GetHeartRateServicePath());
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(
&FakeBluetoothGattServiceClient::ExposeHeartRateCharacteristics,
weak_ptr_factory_.GetWeakPtr()));
-
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(
- &FakeBluetoothGattServiceClient::ToggleServicesResolvedProperty,
- weak_ptr_factory_.GetWeakPtr(), device_path, true));
}
void FakeBluetoothGattServiceClient::HideHeartRateService() {
@@ -134,42 +138,44 @@ void FakeBluetoothGattServiceClient::HideHeartRateService() {
heart_rate_service_path_.clear();
}
-void FakeBluetoothGattServiceClient::ExposeHeartRateServiceWithoutDelay(
+void FakeBluetoothGattServiceClient::ExposeBatteryService(
const dbus::ObjectPath& device_path) {
- if (IsHeartRateVisible()) {
- DCHECK(!heart_rate_service_path_.empty());
- VLOG(1) << "Fake Heart Rate Service already exposed.";
+ if (IsBatteryServiceVisible()) {
+ DCHECK(!battery_service_path_.empty());
+ VLOG(1) << "Fake Battery Service already exposed.";
return;
}
- VLOG(2) << "Exposing fake Heart Rate Service.";
- heart_rate_service_path_ =
- device_path.value() + "/" + kHeartRateServicePathComponent;
- heart_rate_service_properties_.reset(new Properties(base::Bind(
- &FakeBluetoothGattServiceClient::OnPropertyChanged,
- base::Unretained(this), dbus::ObjectPath(heart_rate_service_path_))));
- heart_rate_service_properties_->uuid.ReplaceValue(kHeartRateServiceUUID);
- heart_rate_service_properties_->device.ReplaceValue(device_path);
- heart_rate_service_properties_->primary.ReplaceValue(true);
- NotifyServiceAdded(dbus::ObjectPath(heart_rate_service_path_));
-
- static_cast<FakeBluetoothGattCharacteristicClient*>(
- bluez::BluezDBusManager::Get()->GetBluetoothGattCharacteristicClient())
- ->ExposeHeartRateCharacteristics(
- dbus::ObjectPath(heart_rate_service_path_));
+ VLOG(2) << "Exposing fake Battery Service.";
+ battery_service_path_ =
+ device_path.value() + "/" + kBatteryServicePathComponent;
+ battery_service_properties_.reset(new Properties(base::Bind(
+ &FakeBluetoothGattServiceClient::OnPropertyChanged,
+ base::Unretained(this), dbus::ObjectPath(battery_service_path_))));
+ battery_service_properties_->uuid.ReplaceValue(kBatteryServiceUUID);
+ battery_service_properties_->device.ReplaceValue(device_path);
+ battery_service_properties_->primary.ReplaceValue(true);
- ToggleServicesResolvedProperty(device_path, true);
+ NotifyServiceAdded(GetBatteryServicePath());
}
bool FakeBluetoothGattServiceClient::IsHeartRateVisible() const {
return !!heart_rate_service_properties_.get();
}
+bool FakeBluetoothGattServiceClient::IsBatteryServiceVisible() const {
+ return !!battery_service_properties_.get();
+}
+
dbus::ObjectPath FakeBluetoothGattServiceClient::GetHeartRateServicePath()
const {
return dbus::ObjectPath(heart_rate_service_path_);
}
+dbus::ObjectPath FakeBluetoothGattServiceClient::GetBatteryServicePath() const {
+ return dbus::ObjectPath(battery_service_path_);
+}
+
void FakeBluetoothGattServiceClient::OnPropertyChanged(
const dbus::ObjectPath& object_path,
const std::string& property_name) {
@@ -206,17 +212,4 @@ void FakeBluetoothGattServiceClient::ExposeHeartRateCharacteristics() {
dbus::ObjectPath(heart_rate_service_path_));
}
-void FakeBluetoothGattServiceClient::ToggleServicesResolvedProperty(
- const dbus::ObjectPath& object_path,
- bool resolved) {
- DCHECK(object_path.IsValid());
-
- VLOG(2) << "Toggle the ServicesResolved property to " << resolved
- << " of device " << object_path.value();
- FakeBluetoothDeviceClient* device = static_cast<FakeBluetoothDeviceClient*>(
- bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient());
- // Notify on service discovery complete.
- device->GetProperties(object_path)->services_resolved.ReplaceValue(true);
-}
-
} // namespace bluez

Powered by Google App Engine
This is Rietveld 408576698