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

Commit 6b1eb42e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Icae4235e,I51372fba,Id1fb5d3a,I1a346fdb am: b8343bd3 

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



Change-Id: I52be77ec783d968f37467c05946626115f46a0e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af27678e b8343bd3

system/gd/hci/hci_packets.pdl

+2 −0
Original line number Diff line number Diff line
@@ -2515,6 +2515,7 @@ enum HciVersion : 8 { 
  V_5_0 = 0x09,

  V_5_1 = 0x0a,

  V_5_2 = 0x0b,

  V_5_3 = 0x0c,

}



enum LmpVersion : 8 {
@@ -2530,6 +2531,7 @@ enum LmpVersion : 8 { 
  V_5_0 = 0x09,

  V_5_1 = 0x0a,

  V_5_2 = 0x0b,

  V_5_3 = 0x0c,

}



struct LocalVersionInformation {

tools/rootcanal/data/controller_properties.json

+2 −4
Original line number Diff line number Diff line
@@ -4,11 +4,9 @@ 
  "ScoDataPacketSize": "255",

  "NumAclDataPackets": "10",

  "NumScoDataPackets": "10",

  "Version": "4",

  "Version": "12",

  "Revision": "0",

  "LmpPalVersion": "0",

  "LmpPalVersion": "12",

  "ManufacturerName": "0",

  "LmpPalSubversion": "0",

  "MaximumPageNumber": "0",

  "BdAddress": "123456"

}

tools/rootcanal/model/devices/device_properties.cc

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ DeviceProperties::DeviceProperties(const std::string& file_name) 
      sco_data_packet_size_(255),

      num_acl_data_packets_(10),

      num_sco_data_packets_(10),

      version_(static_cast<uint8_t>(bluetooth::hci::HciVersion::V_4_1)),

      version_(static_cast<uint8_t>(bluetooth::hci::HciVersion::V_5_3)),

      revision_(0),

      lmp_pal_version_(static_cast<uint8_t>(bluetooth::hci::LmpVersion::V_4_1)),

      lmp_pal_version_(static_cast<uint8_t>(bluetooth::hci::LmpVersion::V_5_3)),

      manufacturer_name_(0),

      lmp_pal_subversion_(0),

      le_data_packet_length_(27),