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

Commit 157933f8 authored by Chris Manton's avatar Chris Manton
Browse files

le_advertising:: [2/7] Properly type OnAdvertisingDataSet::status 

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

Change-Id: Idd274e5506b222f947bb506e967be11d610e4c34
parent 33108906

system/gd/hci/facade/le_advertising_manager_facade.cc

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

  }



  void OnAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {

  void OnAdvertisingDataSet(uint8_t advertiser_id, AdvertisingStatus status) {

    AdvertisingCallbackMsg msg;

    msg.set_message_type(AdvertisingCallbackMsgType::ADVERTISING_DATA_SET);

    msg.set_advertiser_id(advertiser_id);

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

    callback_events_.OnIncomingEvent(msg);

  };

  }



  void OnScanResponseDataSet(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
@@ -93,7 +93,7 @@ class AdvertisingCallback { 
                                        AdvertisingStatus status) = 0;

   virtual void OnAdvertisingEnabled(uint8_t advertiser_id, bool enable,

                                     AdvertisingStatus status) = 0;

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

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

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

   virtual void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t tx_power,

                                               uint8_t status) = 0;

system/gd/hci/le_advertising_manager_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ class LeAdvertisingManagerTest : public ::testing::Test { 
        OnAdvertisingSetStarted, void(int reg_id, uint8_t advertiser_id, int8_t tx_power, AdvertisingStatus status));

    MOCK_METHOD3(OnAdvertisingEnabled,

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

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

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

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

    MOCK_METHOD3(OnAdvertisingParametersUpdated, void(uint8_t advertiser_id, int8_t tx_power, uint8_t status));

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

system/gd/security/facade.cc

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

  }



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

  void OnAdvertisingDataSet(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
@@ -268,7 +268,7 @@ class BleAdvertiserInterfaceImpl : public BleAdvertiserInterface, 
                                    advertiser_id, enable, status));

  }



  void OnAdvertisingDataSet(uint8_t advertiser_id, uint8_t status) {

  void OnAdvertisingDataSet(uint8_t advertiser_id, AdvertisingStatus status) {

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

            leaudio_broadcast_update_metadata_callback()) {

      int reg_id =