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

Commit 77a75ada authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

RootCanal: Sanitize header include paths (continued) am: 6d0ddbf7 am: 28afb0f0 

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



Change-Id: I55a6f237ed4fa70b854caa7ae2db352a3e0903fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 469a640e 28afb0f0

tools/rootcanal/model/devices/baseband_sniffer.cc

+10 −3
Original line number Diff line number Diff line
@@ -14,12 +14,19 @@ 
 * limitations under the License.

 */



#include "baseband_sniffer.h"

#include "model/devices/baseband_sniffer.h"



#include <cstdint>

#include <ios>

#include <memory>

#include <string>

#include <utility>

#include <vector>



#include "log.h"

#include "packets/link_layer_packets.h"

#include "pcap.h"



using std::vector;

#include "phy.h"



namespace rootcanal {

tools/rootcanal/model/devices/baseband_sniffer.h

+6 −1
Original line number Diff line number Diff line
@@ -18,8 +18,13 @@ 


#include <cstdint>

#include <fstream>

#include <memory>

#include <string>



#include "device.h"

#include "hci/address.h"

#include "model/devices/device.h"

#include "packets/link_layer_packets.h"

#include "phy.h"



namespace rootcanal {

tools/rootcanal/model/devices/beacon.cc

+10 −1
Original line number Diff line number Diff line
@@ -14,9 +14,18 @@ 
 * limitations under the License.

 */



#include "beacon.h"

#include "model/devices/beacon.h"



#include <chrono>

#include <cstdint>

#include <string>

#include <utility>

#include <vector>



#include "hci/address.h"

#include "model/setup/device_boutique.h"

#include "packets/link_layer_packets.h"

#include "phy.h"



namespace rootcanal {

using namespace model::packets;

tools/rootcanal/model/devices/beacon.h

+5 −1
Original line number Diff line number Diff line
@@ -16,12 +16,16 @@ 


#pragma once



#include <array>

#include <chrono>

#include <cstdint>

#include <memory>

#include <string>

#include <vector>



#include "device.h"

#include "model/devices/device.h"

#include "packets/link_layer_packets.h"

#include "phy.h"



namespace rootcanal {

tools/rootcanal/model/devices/beacon_swarm.cc

+9 −4
Original line number Diff line number Diff line
@@ -14,11 +14,16 @@ 
 * limitations under the License.

 */



#include "beacon_swarm.h"

#include "model/devices/beacon_swarm.h"



#include "model/setup/device_boutique.h"

#include <chrono>

#include <cstdint>

#include <string>

#include <vector>



using std::vector;

#include "model/devices/beacon.h"

#include "model/setup/device_boutique.h"

#include "packets/link_layer_packets.h"



namespace rootcanal {

using namespace model::packets;
@@ -27,7 +32,7 @@ using namespace std::chrono_literals; 
bool BeaconSwarm::registered_ =

    DeviceBoutique::Register("beacon_swarm", &BeaconSwarm::Create);



BeaconSwarm::BeaconSwarm(const vector<std::string>& args) : Beacon(args) {

BeaconSwarm::BeaconSwarm(const std::vector<std::string>& args) : Beacon(args) {

  advertising_interval_ = 1280ms;

  advertising_type_ = LegacyAdvertisingType::ADV_NONCONN_IND;

  advertising_data_ = {