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

Commit 4e04fd07 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "Change advertising set data size" am: 995a8be8 am: 77f18c42 

am: f6ddbfe3

Change-Id: Idf3fa802edecdf012a91b4c8c5a3a5a9f05c921a
parents fa9145cb f6ddbfe3

system/gd/hci/controller.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -686,7 +686,7 @@ struct Controller::impl { 
  uint64_t le_supported_states_;

  uint64_t le_supported_states_;

  LeMaximumDataLength le_maximum_data_length_;

  LeMaximumDataLength le_maximum_data_length_;

  uint16_t le_maximum_advertising_data_length_;

  uint16_t le_maximum_advertising_data_length_;

  uint16_t le_number_supported_advertising_sets_;

  uint8_t le_number_supported_advertising_sets_;

  VendorCapabilities vendor_capabilities_;

  VendorCapabilities vendor_capabilities_;

};  // namespace hci

};  // namespace hci
@@ -836,7 +836,7 @@ uint16_t Controller::GetControllerLeMaximumAdvertisingDataLength() const { 
  return impl_->le_maximum_advertising_data_length_;

  return impl_->le_maximum_advertising_data_length_;

}

}





uint16_t Controller::GetControllerLeNumberOfSupportedAdverisingSets() const {

uint8_t Controller::GetControllerLeNumberOfSupportedAdverisingSets() const {

  return impl_->le_number_supported_advertising_sets_;

  return impl_->le_number_supported_advertising_sets_;

}

}

system/gd/hci/controller.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ class Controller : public Module { 




  virtual uint16_t GetControllerLeMaximumAdvertisingDataLength() const;

  virtual uint16_t GetControllerLeMaximumAdvertisingDataLength() const;





  virtual uint16_t GetControllerLeNumberOfSupportedAdverisingSets() const;

  virtual uint8_t GetControllerLeNumberOfSupportedAdverisingSets() const;





  virtual VendorCapabilities GetControllerVendorCapabilities() const;

  virtual VendorCapabilities GetControllerVendorCapabilities() const;

system/gd/hci/le_advertising_manager_test.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,11 +57,11 @@ class TestController : public Controller { 
    supported_opcodes_.insert(op_code);

    supported_opcodes_.insert(op_code);

  }

  }





  uint16_t GetControllerLeNumberOfSupportedAdverisingSets() const override {

  uint8_t GetControllerLeNumberOfSupportedAdverisingSets() const override {

    return num_advertisers;

    return num_advertisers;

  }

  }





  uint16_t num_advertisers{0};

  uint8_t num_advertisers{0};





 protected:

 protected:

  void Start() override {}

  void Start() override {}