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

Commit bb06a9c7 authored by Chris Manton's avatar Chris Manton
Browse files

le_advertising:: [6/7] Properly type OnPeriodicAdvertisingDataSet::status 

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

Change-Id: Ia1ed4072a295cf318de5bd87cc4f174859e15d0c
parent 7a5a84f6

system/gd/hci/facade/le_advertising_manager_facade.cc

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

  }



  void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {

  void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, AdvertisingStatus status) {

    AdvertisingCallbackMsg msg;

    msg.set_message_type(AdvertisingCallbackMsgType::PERIODIC_ADVERTISING_DATA_SET);

    msg.set_advertiser_id(advertiser_id);

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

    callback_events_.OnIncomingEvent(msg);

  };

  }



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

    AdvertisingCallbackMsg msg;

system/gd/hci/le_advertising_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ class AdvertisingCallback { 
                                               AdvertisingStatus 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 OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, AdvertisingStatus status) = 0;

   virtual void OnPeriodicAdvertisingEnabled(uint8_t advertiser_id, bool enable,

                                             uint8_t 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
@@ -247,7 +247,8 @@ class LeAdvertisingManagerTest : public ::testing::Test { 
                 void(uint8_t advertiser_id, int8_t tx_power, AdvertisingStatus status));

    MOCK_METHOD2(OnPeriodicAdvertisingParametersUpdated,

                 void(uint8_t advertiser_id, AdvertisingStatus status));

    MOCK_METHOD2(OnPeriodicAdvertisingDataSet, void(uint8_t advertiser_id, uint8_t 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(OnOwnAddressRead, void(uint8_t advertiser_id, uint8_t address_type, Address address));

  } mock_advertising_callback_;

system/gd/security/facade.cc

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

  }



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

  void OnPeriodicAdvertisingDataSet(uint8_t /* advertiser_id */, AdvertisingStatus /* status */) {

    // Not used yet

  }

system/main/shim/le_advertising_manager.cc

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

  }



  void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {

  void OnPeriodicAdvertisingDataSet(uint8_t advertiser_id, AdvertisingStatus status) {

    if (com::android::bluetooth::flags::

            leaudio_broadcast_update_metadata_callback()) {

      int reg_id =