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

Commit 819d2d50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Remove Non-flushable Packet Boundary Flag LMP feature" am: 2c2991c9 

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

Change-Id: I9a3872bcaf62920d285cc85f650edb3075ff7425
parents 4462877f 2c2991c9

system/vendor_libs/test_vendor_lib/model/devices/device_properties.h

+0 −6
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static constexpr uint64_t Page0LmpFeatures() { 
      LMPFeaturesPage0Bits::SIMULTANEOUS_LE_AND_BR_CONTROLLER,

      LMPFeaturesPage0Bits::SECURE_SIMPLE_PAIRING_CONTROLLER,

      LMPFeaturesPage0Bits::ENCAPSULATED_PDU,

      LMPFeaturesPage0Bits::NON_FLUSHABLE_PACKET_BOUNDARY_FLAG,

      LMPFeaturesPage0Bits::HCI_LINK_SUPERVISION_TIMEOUT_CHANGED_EVENT,

      LMPFeaturesPage0Bits::VARIABLE_INQUIRY_TX_POWER_LEVEL,

      LMPFeaturesPage0Bits::ENHANCED_POWER_CONTROL,
@@ -92,9 +91,6 @@ static constexpr uint64_t Page0LmpFeatures() { 
  return value;

}



static_assert(Page0LmpFeatures() == 0x875bffdbfe8ffeff,

              "Invalid page 0 features");



static constexpr uint64_t Page1LmpFeatures() {

  LMPFeaturesPage1Bits features[] = {

      LMPFeaturesPage1Bits::SIMULTANEOUS_LE_AND_BR_HOST,
@@ -106,8 +102,6 @@ static constexpr uint64_t Page1LmpFeatures() { 
  return value;

}



static_assert(Page1LmpFeatures() == 0x04, "Invalid page 1 features");



class DeviceProperties {

 public:

  explicit DeviceProperties(const std::string& file_name = "");