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

Commit 00583183 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Send scan_response_ when scanned" into tm-dev am: 86435df4... 

Merge "RootCanal: Send scan_response_ when scanned" into tm-dev am: 86435df4 am: cd2387ab am: bea10963 am: a73e64b6

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



Change-Id: I9d3df4fa621e656ca31f8c01bb0a5aa4c53cfe69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47d619b8 a73e64b6

tools/rootcanal/model/controller/le_advertiser.cc

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ LeAdvertiser::GetScanResponse(bluetooth::hci::Address scanned, 
    return model::packets::LeScanResponseBuilder::Create(

        address_.GetAddress(), peer_address_.GetAddress(),

        static_cast<model::packets::AddressType>(address_.GetAddressType()),

        type_, advertisement_);

        model::packets::AdvertisementType::SCAN_RESPONSE, scan_response_);

  } else {

    uint8_t tx_power_jittered = 2 + tx_power_ - (num_events_ & 0x03);

    return model::packets::RssiWrapperBuilder::Create(
@@ -230,7 +230,7 @@ LeAdvertiser::GetScanResponse(bluetooth::hci::Address scanned, 
        model::packets::LeScanResponseBuilder::Create(

            address_.GetAddress(), peer_address_.GetAddress(),

            static_cast<model::packets::AddressType>(address_.GetAddressType()),

            type_, advertisement_));

            model::packets::AdvertisementType::SCAN_RESPONSE, scan_response_));

  }

}