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

Commit 7d80a37e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Use structured scan response data" am: 81b326fe 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1842584

Change-Id: Ic763fc1a60d71aa31fd2495459ba974a198b0f89
parents 85ba7684 81b326fe

system/gd/hci/hci_packets.pdl

+14 −0
Original line number Diff line number Diff line
@@ -5298,6 +5298,20 @@ packet LeAdvertisingReport : LeMetaEvent (subevent_code = ADVERTISING_REPORT) { 
  advertising_reports : LeAdvertisingReport[],

}



struct LeAdvertisingReportRaw {

  event_type : AdvertisingEventType,

  address_type : AddressType,

  address : Address,

  _size_(advertising_data) : 8,

  advertising_data : 8[],

  rssi : 8,

}



packet LeAdvertisingReportRaw : LeMetaEvent (subevent_code = ADVERTISING_REPORT) {

  _count_(advertising_reports) : 8,

  advertising_reports : LeAdvertisingReportRaw[],

}



packet LeConnectionUpdateComplete : LeMetaEvent (subevent_code = CONNECTION_UPDATE_COMPLETE) {

  status : ErrorCode,

  connection_handle : 12,

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.cc

+34 −40
Original line number Diff line number Diff line
@@ -1467,53 +1467,47 @@ void LinkLayerController::IncomingLeScanResponsePacket( 
  auto adv_type = scan_response.GetAdvertisementType();

  auto address_type =

      static_cast<LeAdvertisement::AddressType>(scan_response.GetAddressType());

  LOG_INFO("Scan response with %s",

           bluetooth::hci::OpCodeText(le_scan_enable_).c_str());

  if (le_scan_enable_ == bluetooth::hci::OpCode::LE_SET_SCAN_ENABLE) {

    if (adv_type != model::packets::AdvertisementType::SCAN_RESPONSE) {

      return;

    }

    std::unique_ptr<bluetooth::packet::RawBuilder> raw_builder_ptr =

        std::make_unique<bluetooth::packet::RawBuilder>();

    raw_builder_ptr->AddOctets1(

        static_cast<uint8_t>(bluetooth::hci::SubeventCode::ADVERTISING_REPORT));

    raw_builder_ptr->AddOctets1(0x01);  // num reports

    raw_builder_ptr->AddOctets1(static_cast<uint8_t>(

        bluetooth::hci::AdvertisingEventType::SCAN_RESPONSE));

    raw_builder_ptr->AddOctets1(static_cast<uint8_t>(address_type));

    raw_builder_ptr->AddAddress(incoming.GetSourceAddress());

    raw_builder_ptr->AddOctets1(ad.size());

    raw_builder_ptr->AddOctets(ad);

    raw_builder_ptr->AddOctets1(GetRssi());

    auto packet = bluetooth::hci::EventBuilder::Create(

        bluetooth::hci::EventCode::LE_META_EVENT, std::move(raw_builder_ptr));

    if (properties_.IsUnmasked(EventCode::LE_META_EVENT)) {

      send_event_(std::move(packet));

    }

  }



  if (le_scan_enable_ == bluetooth::hci::OpCode::LE_SET_EXTENDED_SCAN_ENABLE) {

    std::unique_ptr<bluetooth::packet::RawBuilder> raw_builder_ptr =

        std::make_unique<bluetooth::packet::RawBuilder>();

    raw_builder_ptr->AddOctets1(static_cast<uint8_t>(

        bluetooth::hci::SubeventCode::EXTENDED_ADVERTISING_REPORT));

    raw_builder_ptr->AddOctets1(0x01);  // num reports

    raw_builder_ptr->AddOctets2(0x001a);  // TODO: 0x001b for ADV_SCAN_IND

    raw_builder_ptr->AddOctets1(static_cast<uint8_t>(address_type));

    raw_builder_ptr->AddAddress(incoming.GetSourceAddress());

    raw_builder_ptr->AddOctets1(1);     // Primary_PHY

    raw_builder_ptr->AddOctets1(0);     // Secondary_PHY

    raw_builder_ptr->AddOctets1(0xFF);  // Advertising_SID - not provided

    raw_builder_ptr->AddOctets1(0x7F);  // Tx_Power - Not available

    raw_builder_ptr->AddOctets1(GetRssi());

    raw_builder_ptr->AddOctets1(0);  // Periodic_Advertising_Interval - None

    raw_builder_ptr->AddOctets1(0);  // Direct_Address_Type - PUBLIC

    raw_builder_ptr->AddAddress(Address::kEmpty);  // Direct_Address

    raw_builder_ptr->AddOctets1(ad.size());

    raw_builder_ptr->AddOctets(ad);

    auto packet = bluetooth::hci::EventBuilder::Create(

        bluetooth::hci::EventCode::LE_META_EVENT, std::move(raw_builder_ptr));

    if (properties_.IsUnmasked(EventCode::LE_META_EVENT)) {

      send_event_(std::move(packet));

    }

    bluetooth::hci::LeAdvertisingReportRaw report;

    report.event_type_ = bluetooth::hci::AdvertisingEventType::SCAN_RESPONSE;

    report.address_ = incoming.GetSourceAddress();

    report.address_type_ =

        static_cast<bluetooth::hci::AddressType>(address_type);

    report.advertising_data_ = scan_response.GetData();

    report.rssi_ = GetRssi();



    if (properties_.IsUnmasked(EventCode::LE_META_EVENT) &&

        properties_.GetLeEventSupported(

            bluetooth::hci::SubeventCode::ADVERTISING_REPORT)) {

      send_event_(

          bluetooth::hci::LeAdvertisingReportRawBuilder::Create({report}));

    }

  }



  if (le_scan_enable_ == bluetooth::hci::OpCode::LE_SET_EXTENDED_SCAN_ENABLE &&

      properties_.IsUnmasked(EventCode::LE_META_EVENT) &&

      properties_.GetLeEventSupported(

          bluetooth::hci::SubeventCode::EXTENDED_ADVERTISING_REPORT)) {

    bluetooth::hci::LeExtendedAdvertisingReport report{};

    report.address_ = incoming.GetSourceAddress();

    report.address_type_ =

        static_cast<bluetooth::hci::DirectAdvertisingAddressType>(address_type);

    report.legacy_ = true;

    report.scannable_ = true;

    report.connectable_ = true;  // TODO: false if ADV_SCAN_IND

    report.scan_response_ = true;

    report.primary_phy_ = bluetooth::hci::PrimaryPhyType::LE_1M;

    report.advertising_sid_ = 0xFF;

    report.tx_power_ = 0x7F;

    report.advertising_data_ = ad;

    report.rssi_ = GetRssi();

    send_event_(

        bluetooth::hci::LeExtendedAdvertisingReportBuilder::Create({report}));

  }

}