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

Commit 53c077bb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6947132 from 9c6d7327 to sc-release 

Change-Id: I45f904332dbfc646a2d5a32ac2b74090a6134cd3
parents 9e816e7c 9c6d7327

system/gd/hci/hci_packets.pdl

+1 −1
Original line number Diff line number Diff line
@@ -3145,7 +3145,7 @@ packet LeSetPeriodicAdvertisingData : LeAdvertisingCommand (op_code = LE_SET_PER 
  operation : Operation,

  _reserved_ : 5,

  _size_(scan_response_data) : 8,

  scan_response_data : 8[],

  scan_response_data : GapData[],

}



packet LeSetPeriodicAdvertisingDataComplete : CommandComplete (command_op_code = LE_SET_PERIODIC_ADVERTISING_DATA) {

system/gd/hci/le_advertising_manager.cc

+272 −41

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/hci/le_advertising_manager.h

+24 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <memory>



#include "common/callback.h"

#include "hci/address_with_type.h"

#include "hci/hci_packets.h"

#include "module.h"
@@ -60,6 +61,15 @@ class ExtendedAdvertisingConfig : public AdvertisingConfig { 
  ExtendedAdvertisingConfig(const AdvertisingConfig& config);

};



class PeriodicAdvertisingParameters {

 public:

  uint16_t min_interval;

  uint16_t max_interval;

  uint16_t properties;



  enum AdvertisingProperty { INCLUDE_TX_POWER = 0x06 };

};



using AdvertiserId = uint8_t;



class AdvertisingCallback {
@@ -89,6 +99,7 @@ class LeAdvertisingManager : public bluetooth::Module { 
 public:

  static constexpr AdvertiserId kInvalidId = 0xFF;

  static constexpr uint8_t kInvalidHandle = 0xFF;

  static constexpr uint8_t kAdvertisingSetIdMask = 0x0F;

  LeAdvertisingManager();



  size_t GetNumberOfAdvertisingInstances() const;
@@ -105,7 +116,19 @@ class LeAdvertisingManager : public bluetooth::Module { 
      const common::Callback<void(ErrorCode, uint8_t, uint8_t)>& set_terminated_callback,

      os::Handler* handler);



  void RemoveAdvertiser(AdvertiserId id);

  void SetParameters(AdvertiserId advertiser_id, ExtendedAdvertisingConfig config);



  void SetData(AdvertiserId advertiser_id, bool set_scan_rsp, std::vector<GapData> data);



  void EnableAdvertiser(AdvertiserId advertiser_id, bool enable, uint16_t duration, uint8_t maxExtAdvEvents);



  void SetPeriodicParameters(AdvertiserId advertiser_id, PeriodicAdvertisingParameters periodic_advertising_parameters);



  void SetPeriodicData(AdvertiserId advertiser_id, std::vector<GapData> data);



  void EnablePeriodicAdvertising(AdvertiserId advertiser_id, bool enable);



  void RemoveAdvertiser(AdvertiserId advertiser_id);



  void RegisterAdvertisingCallback(AdvertisingCallback* advertising_callback);

system/gd/hci/le_advertising_manager_test.cc

+204 −6

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/security/initial_informations.h

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ struct InitialInformations { 
  hci::Role my_role;

  hci::AddressWithType my_connection_address;



  hci::AddressWithType my_identity_address;

  crypto_toolbox::Octet16 my_identity_resolving_key;



  /* My capabilities, as in pairing request/response */

  struct {

    IoCapability io_capability;