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

Commit f40d09d0 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "Rootcanal: Beacons should use ScanResponse" 

am: 8a6228fd

Change-Id: I9c60388dd1b744b1302b5e7af2cda86991da9575
parents 7c071062 8a6228fd

system/vendor_libs/test_vendor_lib/model/devices/beacon.cc

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void Beacon::TimerTick() { 
void Beacon::IncomingPacket(model::packets::LinkLayerPacketView packet) {

  if (packet.GetDestinationAddress() == properties_.GetLeAddress() &&

      packet.GetType() == model::packets::PacketType::LE_SCAN) {

    auto scan_response = model::packets::LeAdvertisementBuilder::Create(

    auto scan_response = model::packets::LeScanResponseBuilder::Create(

        properties_.GetLeAddress(), packet.GetSourceAddress(),

        model::packets::AddressType::PUBLIC,

        model::packets::AdvertisementType::SCAN_RESPONSE,

system/vendor_libs/test_vendor_lib/model/devices/loopback.cc

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void Loopback::IncomingPacket(model::packets::LinkLayerPacketView packet) { 
      packet.GetType() == model::packets::PacketType::LE_SCAN) {

    LOG_INFO("Got a scan");



    auto scan_response = model::packets::LeAdvertisementBuilder::Create(

    auto scan_response = model::packets::LeScanResponseBuilder::Create(

        properties_.GetLeAddress(), packet.GetSourceAddress(),

        model::packets::AddressType::PUBLIC,

        model::packets::AdvertisementType::SCAN_RESPONSE,