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

Commit 30d4bac0 authored by Chris Manton's avatar Chris Manton
Browse files

le_advertising:: [7/7] Properly type OnPeriodicAdvertisingEnabled::status 

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

Change-Id: I9e87cca9aefcbeabaf488b2f15b2bddf3cf9da25
parent bb06a9c7

system/gd/hci/facade/le_advertising_manager_facade.cc

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

  }



  void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool /* enable */, uint8_t status) {

  void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool /* enable */,

                                    AdvertisingStatus status) {

    AdvertisingCallbackMsg msg;

    msg.set_message_type(AdvertisingCallbackMsgType::PERIODIC_ADVERTISING_ENABLED);

    msg.set_advertiser_id(advertiser_id);

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

    callback_events_.OnIncomingEvent(msg);

  };

  }



  void OnOwnAddressRead(uint8_t advertiser_id, uint8_t address_type, Address address) {

    log::info("OnOwnAddressRead Address:{}, address_type:{}", address, address_type);

system/gd/hci/le_advertising_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class AdvertisingCallback { 
                                                       AdvertisingStatus status) = 0;

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

   virtual void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable,

                                             uint8_t status) = 0;

                                             AdvertisingStatus status) = 0;

   virtual void OnOwnAddressRead(uint8_t advertiser_id, uint8_t address_type, Address address) = 0;

};

system/gd/hci/le_advertising_manager_test.cc

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

    MOCK_METHOD2(OnPeriodicAdvertisingDataSet,

                 void(uint8_t advertiser_id, AdvertisingStatus status));

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

    MOCK_METHOD3(OnPeriodicAdvertisingEnabled,

                 void(uint8_t advertiser_id, bool enable, AdvertisingStatus status));

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

  } mock_advertising_callback_;

};

system/gd/security/facade.cc

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

  }



  void OnPeriodicAdvertisingEnabled(

      uint8_t /* advertiser_id */, bool /* enable */, uint8_t /* status */) {

  void OnPeriodicAdvertisingEnabled(uint8_t /* advertiser_id */, bool /* enable */,

                                    AdvertisingStatus /* status */) {

    // Not used yet

  }

system/main/shim/le_advertising_manager.cc

+1 −2
Original line number Diff line number Diff line
@@ -330,8 +330,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
        base::Unretained(advertising_callbacks_), advertiser_id, status));

  }



  void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable,

                                    uint8_t status) {

  void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable, AdvertisingStatus status) {

    do_in_jni_thread(

        base::BindOnce(&AdvertisingCallbacks::OnPeriodicAdvertisingEnabled,

                       base::Unretained(advertising_callbacks_), advertiser_id,