Revert "[Floss] Wire GetLowEnergyScanSessionHardwareOffloadingStatus"

This reverts commit 895cf33. Reason for revert: Speculative revert for MSAN failures: https://ci.chromium.org/ui/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Tests/34566/overview Original change's description: > [Floss] Wire GetLowEnergyScanSessionHardwareOffloadingStatus > > This wires the feature detection API of LE scanning hardware offload for > Floss. > > Also a minor change in FlossProperty to support non-updateable property. > > Bug: b:246404026 > > Change-Id: I88bf943baeca33ee064308ea9e678e1d4f896188 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4228513 > Reviewed-by: Michael Sun <michaelfsun@google.com> > Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org> > Commit-Queue: Abhishek Pandit-Subedi <abhishekpandit@google.com> > Cr-Commit-Position: refs/heads/main@{#1118738} Bug: b:246404026 Change-Id: I66b69070938d51e28445d1b7bd22af2d22503222 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4350189 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Tim Sergeant <tsergeant@chromium.org> Owners-Override: Tim Sergeant <tsergeant@chromium.org> Cr-Commit-Position: refs/heads/main@{#1119135}
chromium · Mar 19, 2023 · 9b90c5a · 9b90c5a
1 parent d6465d2
commit 9b90c5a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -519,8 +519,6 @@ class DEVICE_BLUETOOTH_EXPORT FlossGattManagerClient
                                       int32_t handle,
                                       bool confirm,
                                       std::vector<uint8_t> 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<FlossGattServerObserver>
       gatt_server_exported_callback_manager_{gatt::kServerCallbackInterface};
 
-  FlossProperty<bool> property_msft_supported_{
-      kGattInterface, gatt::kCallbackInterface, "IsMsftSupported",
-      nullptr /* property is not updateable */};
-
   base::WeakPtrFactory<FlossGattManagerClient> weak_ptr_factory_{this};
 };