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

Commit 11a5bc4f authored by Chris Manton's avatar Chris Manton
Browse files

le_advertising:: [4/7] Properly type OnAdvertisingParametersUpdated::status 

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

Change-Id: I178a2c3ae796c45bc08a02502a7f521cf3084ce2
parent 1ebbdbb2

system/gd/hci/facade/le_advertising_manager_facade.cc

+3 −3
Original line number Diff line number Diff line
@@ -450,14 +450,14 @@ class LeAdvertisingManagerFacadeService : public LeAdvertisingManagerFacade::Ser 
    callback_events_.OnIncomingEvent(msg);

  }



  void OnAdvertisingParametersUpdated(

      uint8_t advertiser_id, int8_t /* tx_power */, uint8_t status) {

  void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t /* tx_power */,

                                      AdvertisingStatus status) {

    AdvertisingCallbackMsg msg;

    msg.set_message_type(AdvertisingCallbackMsgType::ADVERTISING_PARAMETERS_UPDATED);

    msg.set_advertiser_id(advertiser_id);

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

    callback_events_.OnIncomingEvent(msg);

  };

  }



  void OnPeriodicAdvertisingParametersUpdated(uint8_t advertiser_id, uint8_t status) {

    AdvertisingCallbackMsg msg;

system/gd/hci/le_advertising_manager.h

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

   virtual void OnScanResponseDataSet(uint8_t advertiser_id, AdvertisingStatus status) = 0;

   virtual void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t tx_power,

                                               uint8_t status) = 0;

                                               AdvertisingStatus status) = 0;

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

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

   virtual void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable,

system/gd/hci/le_advertising_manager_test.cc

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

    MOCK_METHOD2(OnAdvertisingDataSet, void(uint8_t advertiser_id, AdvertisingStatus status));

    MOCK_METHOD2(OnScanResponseDataSet, void(uint8_t advertiser_id, AdvertisingStatus status));

    MOCK_METHOD3(OnAdvertisingParametersUpdated, void(uint8_t advertiser_id, int8_t tx_power, uint8_t 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(OnPeriodicAdvertisingDataSet, void(uint8_t advertiser_id, uint8_t status));

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

system/gd/security/facade.cc

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

  }



  void OnAdvertisingParametersUpdated(

      uint8_t /* advertiser_id */, int8_t /* tx_power */, uint8_t /* status */) {

  void OnAdvertisingParametersUpdated(uint8_t /* advertiser_id */, int8_t /* tx_power */,

                                      AdvertisingStatus /* status */) {

    // Not used yet

  }

system/main/shim/le_advertising_manager.cc

+2 −2
Original line number Diff line number Diff line
@@ -289,14 +289,14 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
                                    advertiser_id, status));

  }



  void OnScanResponseDataSet(uint8_t advertiser_id, uint8_t status) {

  void OnScanResponseDataSet(uint8_t advertiser_id, AdvertisingStatus status) {

    do_in_jni_thread(base::BindOnce(

        &AdvertisingCallbacks::OnScanResponseDataSet,

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

  }



  void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t tx_power,

                                      uint8_t status) {

                                      AdvertisingStatus status) {

    do_in_jni_thread(

        base::BindOnce(&AdvertisingCallbacks::OnAdvertisingParametersUpdated,

                       base::Unretained(advertising_callbacks_), advertiser_id,