Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a15dc219 authored by Arman Uguray's avatar Arman Uguray Committed by Android Git Automerger
Browse files

am f8ff4126: service: Fix build breakage. 

* commit 'f8ff4126':
  service: Fix build breakage.
parents 506066c6 f8ff4126

system/service/low_energy_client.cpp

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ bool LowEnergyClientFactory::RegisterClient(const UUID& uuid, 
}



void LowEnergyClientFactory::RegisterClientCallback(

    hal::BluetoothGattInterface* /* gatt_iface */,

    int status, int client_if,

    const bt_uuid_t& app_uuid) {

  UUID uuid(app_uuid);

system/service/low_energy_client.h

+4 −2
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ class LowEnergyClientFactory 


 private:

  // BluetoothGattInterface::ClientObserver overrides:

  void RegisterClientCallback(int status, int client_if,

  void RegisterClientCallback(

      hal::BluetoothGattInterface* gatt_iface,

      int status, int client_if,

      const bt_uuid_t& app_uuid) override;



  // Map of pending calls to register.

system/service/test/low_energy_client_unittest.cpp

+18 −0
Original line number Diff line number Diff line
@@ -34,6 +34,24 @@ class MockGattHandler : public hal::FakeBluetoothGattInterface::TestHandler { 


  MOCK_METHOD1(RegisterClient, bt_status_t(bt_uuid_t*));

  MOCK_METHOD1(UnregisterClient, bt_status_t(int));

  MOCK_METHOD7(MultiAdvEnable, bt_status_t(int, int, int, int, int, int, int));

  MOCK_METHOD10(MultiAdvSetInstDataMock,

                bt_status_t(bool, bool, bool, int,

                            int, char*, int, char*, int, char*));

  MOCK_METHOD1(MultiAdvDisable, bt_status_t(int));



  bt_status_t MultiAdvSetInstData(

      int client_if, bool set_scan_rsp, bool include_name,

      bool incl_txpower, int appearance,

      int manufacturer_len, char* manufacturer_data,

      int service_data_len, char* service_data,

      int service_uuid_len, char* service_uuid) override {

    return MultiAdvSetInstDataMock(

        set_scan_rsp, include_name, incl_txpower, appearance,

        manufacturer_len, manufacturer_data,

        service_data_len, service_data,

        service_uuid_len, service_uuid);

  }



 private:

  DISALLOW_COPY_AND_ASSIGN(MockGattHandler);