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

Commit 49b02d54 authored by Chris Manton's avatar Chris Manton Committed by android-build-merger
Browse files

Merge "Plumb advertiser data through shim controller" 

am: bfaa9188

Change-Id: I267e15011f06e7d6bf71d7b00e6c4e65413e3ea9
parents 67f16d95 bfaa9188

system/gd/shim/controller.cc

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ uint64_t Controller::GetControllerLeSupportedStates() const { 
  return pimpl_->hci_controller_->GetControllerLeSupportedStates();

}



uint8_t Controller::GetControllerLeNumberOfSupportedAdverisingSets() const {

  return pimpl_->hci_controller_->GetControllerLeNumberOfSupportedAdverisingSets();

}



uint8_t Controller::GetControllerLocalExtendedFeaturesMaxPageNumber() const {

  return pimpl_->hci_controller_->GetControllerLocalExtendedFeaturesMaxPageNumber();

}

system/gd/shim/controller.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ class Controller : public bluetooth::Module, public bluetooth::shim::IController 
  uint64_t GetControllerLeLocalSupportedFeatures() const override;

  uint64_t GetControllerLeSupportedStates() const override;

  uint64_t GetControllerLocalExtendedFeatures(uint8_t page_number) const override;

  uint8_t GetControllerLeNumberOfSupportedAdverisingSets() const override;

  uint8_t GetControllerLocalExtendedFeaturesMaxPageNumber() const override;



 protected:

system/gd/shim/icontroller.h

+1 −1
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ struct IController { 
  virtual uint64_t GetControllerLeLocalSupportedFeatures() const = 0;

  virtual uint64_t GetControllerLeSupportedStates() const = 0;

  virtual uint64_t GetControllerLocalExtendedFeatures(uint8_t page_number) const = 0;

  virtual uint8_t GetControllerLeNumberOfSupportedAdverisingSets() const = 0;

  virtual uint8_t GetControllerLocalExtendedFeaturesMaxPageNumber() const = 0;



  virtual ~IController() {}

};