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

Commit 9f411be0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update the advertising_event_properties to match the definition" into... 

Merge "Update the advertising_event_properties to match the definition" into main am: 811f3370 am: 79581335

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3386259



Change-Id: I82e5ef181437414d5ac591840a19b58fb24e2bc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60cd6838 79581335

system/btif/src/btif_dm.cc

+2 −1
Original line number Diff line number Diff line
@@ -3094,7 +3094,7 @@ static void id_status_callback(tBT_TRANSPORT transport, bool is_valid, const Oct 


  auto advertiser = bluetooth::shim::get_ble_advertiser_instance();

  ::AdvertiseParameters parameters{};

  parameters.advertising_event_properties = 0x0045 /* connectable, discoverable, tx power */;

  parameters.advertising_event_properties = 0x0041 /* connectable, tx power */;

  parameters.min_interval = 0xa0;   // 100 ms

  parameters.max_interval = 0x500;  // 800 ms

  parameters.channel_map = 0x7;     // Use all the channels
@@ -3103,6 +3103,7 @@ static void id_status_callback(tBT_TRANSPORT transport, bool is_valid, const Oct 
  parameters.secondary_advertising_phy = 2;

  parameters.scan_request_notification_enable = 0;

  parameters.own_address_type = BLE_ADDR_RANDOM;

  parameters.discoverable = true;



  std::vector<uint8_t> advertisement{0x02, 0x01 /* Flags */, 0x02 /* Connectable */};

  std::vector<uint8_t> scan_data{};