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

Commit 4a25208c authored by Myles Watson's avatar Myles Watson
Browse files

RootCanal: Use Device::Send in devices 

Bug: 154020729
Test: cert/run --host
Tag: #stability
Change-Id: Ie9efd0e244fb498a8ed76dfabe58c029c0cbbc7f
parent da91f15b

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

+2 −6
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ void Beacon::TimerTick() { 
    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

        std::move(ad);



    for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

      phy->Send(to_send);

    }

    SendLinkLayerPacket(to_send, Phy::Type::LOW_ENERGY);

  }

}
@@ -87,9 +85,7 @@ void Beacon::IncomingPacket(model::packets::LinkLayerPacketView packet) { 
    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

        std::move(scan_response);



    for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

      phy->Send(to_send);

    }

    SendLinkLayerPacket(to_send, Phy::Type::LOW_ENERGY);

  }

}

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

+1 −4
Original line number Diff line number Diff line
@@ -80,10 +80,7 @@ void Loopback::IncomingPacket(model::packets::LinkLayerPacketView packet) { 
    std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

        std::move(scan_response);



    for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

      LOG_INFO("Sending a Scan Response on a Phy");

      phy->Send(to_send);

    }

    SendLinkLayerPacket(to_send, Phy::Type::LOW_ENERGY);

  }

}

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

+2 −10
Original line number Diff line number Diff line
@@ -165,16 +165,12 @@ void ScriptedBeacon::TimerTick() { 
      }

    } break;

    case PlaybackEvent::PLAYBACK_STARTED: {

      std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send;

      while (has_time_elapsed(next_ad_.ad_time)) {

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

            next_ad_.address, Address::kEmpty /* Destination */,

            model::packets::AddressType::RANDOM,

            model::packets::AdvertisementType::ADV_NONCONN_IND, next_ad_.ad);

        to_send = std::move(ad);

        for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

          phy->Send(to_send);

        }

        SendLinkLayerPacket(std::move(ad), Phy::Type::LOW_ENERGY);

        if (packet_num_ < ble_ad_list_.advertisements().size()) {

          get_next_advertisement();

        } else {
@@ -208,12 +204,8 @@ void ScriptedBeacon::IncomingPacket( 
              properties_.GetLeAddressType()),

          model::packets::AdvertisementType::SCAN_RESPONSE,

          properties_.GetLeScanResponse());

      std::shared_ptr<model::packets::LinkLayerPacketBuilder> to_send =

          std::move(scan_response);

      set_state(PlaybackEvent::SCANNED_ONCE);

      for (const auto& phy : phy_layers_[Phy::Type::LOW_ENERGY]) {

        phy->Send(to_send);

      }

      SendLinkLayerPacket(std::move(scan_response), Phy::Type::LOW_ENERGY);

    }

  }

}