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

Commit 1ebbdbb2 authored by Chris Manton's avatar Chris Manton
Browse files

le_advertising:: [3/7] Properly type OnScanResponseDataSet::status 

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

Change-Id: Ie20a3097729ae9c0f6477bb76063b7fc2c7716e4
parent 157933f8

system/gd/hci/facade/le_advertising_manager_facade.cc

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

  }



  void OnScanResponseDataSet(uint8_t advertiser_id, uint8_t status) {

  void OnScanResponseDataSet(uint8_t advertiser_id, AdvertisingStatus status) {

    AdvertisingCallbackMsg msg;

    msg.set_message_type(AdvertisingCallbackMsgType::SCAN_RESPONSE_DATA_SET);

    msg.set_advertiser_id(advertiser_id);

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

    callback_events_.OnIncomingEvent(msg);

  };

  }



  void OnAdvertisingParametersUpdated(

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

system/gd/hci/le_advertising_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class AdvertisingCallback { 
   virtual void OnAdvertisingEnabled(uint8_t advertiser_id, bool enable,

                                     AdvertisingStatus 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 OnScanResponseDataSet(uint8_t advertiser_id, AdvertisingStatus status) = 0;

   virtual void OnAdvertisingParametersUpdated(uint8_t advertiser_id, int8_t tx_power,

                                               uint8_t status) = 0;

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

system/gd/hci/le_advertising_manager_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ class LeAdvertisingManagerTest : public ::testing::Test { 
    MOCK_METHOD3(OnAdvertisingEnabled,

                 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, uint8_t 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_METHOD2(OnPeriodicAdvertisingParametersUpdated, void(uint8_t advertiser_id, uint8_t status));

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

system/gd/security/facade.cc

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

  }



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

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

    // Not used yet

  }