diff --git a/device/bluetooth/floss/bluetooth_adapter_floss.cc b/device/bluetooth/floss/bluetooth_adapter_floss.cc index fe27749b3cca1..6ce9274010253 100644 --- a/device/bluetooth/floss/bluetooth_adapter_floss.cc +++ b/device/bluetooth/floss/bluetooth_adapter_floss.cc @@ -1235,11 +1235,8 @@ BluetoothAdapterFloss::StartLowEnergyScanSession( device::BluetoothAdapter::LowEnergyScanSessionHardwareOffloadingStatus BluetoothAdapterFloss::GetLowEnergyScanSessionHardwareOffloadingStatus() { - return FlossDBusManager::Get()->GetGattManagerClient()->GetMsftSupported() - ? device::BluetoothAdapter:: - LowEnergyScanSessionHardwareOffloadingStatus::kSupported - : device::BluetoothAdapter:: - LowEnergyScanSessionHardwareOffloadingStatus::kNotSupported; + NOTIMPLEMENTED(); + return LowEnergyScanSessionHardwareOffloadingStatus::kNotSupported; } #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/device/bluetooth/floss/floss_dbus_client.h b/device/bluetooth/floss/floss_dbus_client.h index b9414b3b03f31..dc92ff111e4f2 100644 --- a/device/bluetooth/floss/floss_dbus_client.h +++ b/device/bluetooth/floss/floss_dbus_client.h @@ -896,10 +896,6 @@ class FlossProperty { weak_ptr_factory_.GetWeakPtr()), bus, service_name, interface_, path, getter_); - if (!on_update_) { - return; - } - // Listen for property updates. dbus::ExportedObject* exported_object = bus->GetExportedObject(callback_path); @@ -955,10 +951,8 @@ class FlossProperty { const char* interface_; const char* callback_interface_; - // Method name to call to Floss daemon to get property value. + // Method names. const char* getter_; - // Method name called by Floss daemon to us to notify updates. - // Null means the property value never changes. const char* on_update_; // Keeps the property value. diff --git a/device/bluetooth/floss/floss_gatt_manager_client.cc b/device/bluetooth/floss/floss_gatt_manager_client.cc index f7fbb99cfef9b..f57c9f5207c8b 100644 --- a/device/bluetooth/floss/floss_gatt_manager_client.cc +++ b/device/bluetooth/floss/floss_gatt_manager_client.cc @@ -636,10 +636,6 @@ void FlossGattManagerClient::Init(dbus::Bus* bus, return; } - property_msft_supported_.Init(this, bus_, service_name_, gatt_adapter_path_, - dbus::ObjectPath(kExportedCallbacksPath), - base::DoNothing()); - // Everything is queued for registration so save |on_ready| for later. on_ready_ = std::move(on_ready); } diff --git a/device/bluetooth/floss/floss_gatt_manager_client.h b/device/bluetooth/floss/floss_gatt_manager_client.h index 22b6382f9716a..8a2f05426f9ac 100644 --- a/device/bluetooth/floss/floss_gatt_manager_client.h +++ b/device/bluetooth/floss/floss_gatt_manager_client.h @@ -519,8 +519,6 @@ class DEVICE_BLUETOOTH_EXPORT FlossGattManagerClient int32_t handle, bool confirm, std::vector value); - // Get whether MSFT extension is supported. - bool GetMsftSupported() const { return property_msft_supported_.Get(); } // Initialize the gatt client for the given adapter. void Init(dbus::Bus* bus, @@ -687,10 +685,6 @@ class DEVICE_BLUETOOTH_EXPORT FlossGattManagerClient ExportedCallbackManager gatt_server_exported_callback_manager_{gatt::kServerCallbackInterface}; - FlossProperty property_msft_supported_{ - kGattInterface, gatt::kCallbackInterface, "IsMsftSupported", - nullptr /* property is not updateable */}; - base::WeakPtrFactory weak_ptr_factory_{this}; };