arc: bluetooth: Remove OnServices*

These two functions are dead. Android does not provide such mechanism to report dynamic change of gatt services. Bug: 111367421 Test: CQ Change-Id: I3055e7e8c13268ef96aa781ac4758ce4f13a99c5 Reviewed-on: https://chromium-review.googlesource.com/c/1395896 Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Reviewed-by: Greg Kerr <kerrnel@chromium.org> Commit-Queue: Qiyu Hu <qiyuh@google.com> Cr-Commit-Position: refs/heads/master@{#620406}
Denger-Network · Jan 7, 2019 · aa95674 · aa95674
1 parent 5a7f84f
commit aa95674
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/components/arc/common/bluetooth.mojom b/components/arc/common/bluetooth.mojom
@@ -402,7 +402,7 @@ interface BluetoothHost {
 };
 
 // Next Method ID: 22
-// Deprecated Method ID: 2, 6
+// Deprecated Method ID: 2, 6, 11, 12
 interface BluetoothInstance {
   // DEPRECATED: Please use Init@18 instead.
   InitDeprecated@0(BluetoothHost host_ptr);
@@ -435,11 +435,6 @@ interface BluetoothInstance {
                                     BluetoothGattStatus status);
   [MinVersion=1] OnGetGattDB@10(BluetoothAddress remote_addr,
                                 array<BluetoothGattDBElement> db);
-  [MinVersion=1] OnServicesRemoved@11(BluetoothAddress remote_addr,
-                                      uint16 start_handle,
-                                      uint16 end_handle);
-  [MinVersion=1] OnServicesAdded@12(BluetoothAddress remote_addr,
-                                    array<BluetoothGattDBElement> db);
   [MinVersion=2] OnGattNotify@13(BluetoothAddress remote_addr,
                                  BluetoothGattServiceID service_id,
                                  BluetoothGattID char_id,

diff --git a/components/arc/test/fake_bluetooth_instance.cc b/components/arc/test/fake_bluetooth_instance.cc
@@ -94,15 +94,6 @@ void FakeBluetoothInstance::OnGetGattDB(
       std::make_unique<GattDBResult>(std::move(remote_addr), std::move(db)));
 }
 
-void FakeBluetoothInstance::OnServicesRemoved(
-    mojom::BluetoothAddressPtr remote_addr,
-    uint16_t start_handle,
-    uint16_t end_handle) {}
-
-void FakeBluetoothInstance::OnServicesAdded(
-    mojom::BluetoothAddressPtr remote_addr,
-    std::vector<mojom::BluetoothGattDBElementPtr> db) {}
-
 void FakeBluetoothInstance::OnGattNotify(
     mojom::BluetoothAddressPtr remote_addr,
     mojom::BluetoothGattServiceIDPtr service_id,

diff --git a/components/arc/test/fake_bluetooth_instance.h b/components/arc/test/fake_bluetooth_instance.h
@@ -98,12 +98,6 @@ class FakeBluetoothInstance : public mojom::BluetoothInstance {
                         mojom::BluetoothGattStatus status) override;
   void OnGetGattDB(mojom::BluetoothAddressPtr remote_addr,
                    std::vector<mojom::BluetoothGattDBElementPtr> db) override;
-  void OnServicesRemoved(mojom::BluetoothAddressPtr remote_addr,
-                         uint16_t start_handle,
-                         uint16_t end_handle) override;
-  void OnServicesAdded(
-      mojom::BluetoothAddressPtr remote_addr,
-      std::vector<mojom::BluetoothGattDBElementPtr> db) override;
 
   void OnGattNotify(mojom::BluetoothAddressPtr remote_addr,
                     mojom::BluetoothGattServiceIDPtr service_id,