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

Commit 7a5a84f6 authored by Chris Manton's avatar Chris Manton
Browse files

le_advertising:: [5/7] Properly type 

OnPeriodicAdvertisingParametersUpdated::status

Bug: 350751285
Test: m .
Flag: EXEMPT, Explicit typing
le_advertising:: OnPeriodicAdvertisingParametersUpdated

Change-Id: I3108b5ec6a8838a2942315ccc83fe3c6028d3e7b
parent 11a5bc4f

system/gd/hci/facade/le_advertising_manager_facade.cc

+2 −2
Original line number Diff line number Diff line
@@ -459,13 +459,13 @@ class LeAdvertisingManagerFacadeService : public LeAdvertisingManagerFacade::Ser 
    callback_events_.OnIncomingEvent(msg);

  }



  void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id, uint8_t status) {

  void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id, AdvertisingStatus status) {

    AdvertisingCallbackMsg msg;

    msg.set_message_type(AdvertisingCallbackMsgType::PERIODIC_ADVERTISING_PARAMETERS_UPDATED);

    msg.set_advertiser_id(advertiser_id);

    msg.set_status(static_cast<facade::AdvertisingStatus>(status));

    callback_events_.OnIncomingEvent(msg);

  };

  }



  void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {

    AdvertisingCallbackMsg msg;

system/gd/hci/le_advertising_manager.h

+2 −1
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ class AdvertisingCallback { 
   virtual void OnScanResponseDataSet(uint8_t advertiser_id, AdvertisingStatus status) = 0;

   virtual void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t tx_power,

                                               AdvertisingStatus status) = 0;

   virtual void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id, uint8_t status) = 0;

   virtual void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id,

                                                       AdvertisingStatus status) = 0;

   virtual void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) = 0;

   virtual void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable,

                                             uint8_t status) = 0;

system/gd/hci/le_advertising_manager_test.cc

+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ class LeAdvertisingManagerTest : public ::testing::Test { 
    MOCK_METHOD2(OnScanResponseDataSet, void(uint8_t advertiser_id, AdvertisingStatus status));

    MOCK_METHOD3(OnAdvertisingParametersUpdated,

                 void(uint8_t advertiser_id, int8_t tx_power, AdvertisingStatus status));

    MOCK_METHOD2(OnPeriodicAdvertisingParametersUpdated, void(uint8_t advertiser_id, uint8_t status));

    MOCK_METHOD2(OnPeriodicAdvertisingParametersUpdated,

                 void(uint8_t advertiser_id, AdvertisingStatus status));

    MOCK_METHOD2(OnPeriodicAdvertisingDataSet, void(uint8_t advertiser_id, uint8_t status));

    MOCK_METHOD3(OnPeriodicAdvertisingEnabled, void(uint8_t advertiser_id, bool enable, uint8_t status));

    MOCK_METHOD3(OnOwnAddressRead, void(uint8_t advertiser_id, uint8_t address_type, Address address));

system/gd/security/facade.cc

+2 −1
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, 
    // Not used yet

  }



  void OnPeriodicAdvertisingParametersUpdated(uint8_t /* advertiser_id */, uint8_t /* status */) {

  void OnPeriodicAdvertisingParametersUpdated(uint8_t /* advertiser_id */,

                                              AdvertisingStatus /* status */) {

    // Not used yet

  }

system/main/shim/le_advertising_manager.cc

+1 −2
Original line number Diff line number Diff line
@@ -303,8 +303,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
                       tx_power, status));

  }



  void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id,

                                              uint8_t status) {

  void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id, AdvertisingStatus status) {

    do_in_jni_thread(base::BindOnce(

        &AdvertisingCallbacks::OnPeriodicAdvertisingParametersUpdated,

        base::Unretained(advertising_callbacks_), advertiser_id, status));