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

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

Merge "Revert "Revert "[RootCanal] Enable LL_PRIVACY""" am: 131ef8f9 am:... 

Merge "Revert "Revert "[RootCanal] Enable LL_PRIVACY""" am: 131ef8f9 am: 87dc52a4 am: 3471d20e am: 227e57f8

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



Change-Id: I8675dd0126cb59fd96212eefd819cc3575171147
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebf59cca 227e57f8

tools/rootcanal/model/controller/controller_properties.cc

+10 −10
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static constexpr uint64_t LlFeatures() { 
      LLFeaturesBits::EXTENDED_REJECT_INDICATION,

      LLFeaturesBits::PERIPHERAL_INITIATED_FEATURES_EXCHANGE,

      LLFeaturesBits::LE_PING,

      // LLFeaturesBits::LL_PRIVACY,

      LLFeaturesBits::LL_PRIVACY,

      LLFeaturesBits::EXTENDED_SCANNER_FILTER_POLICIES,

      LLFeaturesBits::LE_2M_PHY, LLFeaturesBits::LE_CODED_PHY,

      LLFeaturesBits::LE_EXTENDED_ADVERTISING,
@@ -320,14 +320,14 @@ static std::array<uint8_t, 64> SupportedCommands() { 
      OpCodeIndex::LE_WRITE_SUGGESTED_DEFAULT_DATA_LENGTH,

      // OpCodeIndex::LE_READ_LOCAL_P_256_PUBLIC_KEY,

      // OpCodeIndex::LE_GENERATE_DHKEY_V1,

      // OpCodeIndex::LE_ADD_DEVICE_TO_RESOLVING_LIST,

      // OpCodeIndex::LE_REMOVE_DEVICE_FROM_RESOLVING_LIST,

      // OpCodeIndex::LE_CLEAR_RESOLVING_LIST,

      // OpCodeIndex::LE_READ_RESOLVING_LIST_SIZE,

      // OpCodeIndex::LE_READ_PEER_RESOLVABLE_ADDRESS,

      // OpCodeIndex::LE_READ_LOCAL_RESOLVABLE_ADDRESS,

      // OpCodeIndex::LE_SET_ADDRESS_RESOLUTION_ENABLE,

      // OpCodeIndex::LE_SET_RESOLVABLE_PRIVATE_ADDRESS_TIMEOUT,

      OpCodeIndex::LE_ADD_DEVICE_TO_RESOLVING_LIST,

      OpCodeIndex::LE_REMOVE_DEVICE_FROM_RESOLVING_LIST,

      OpCodeIndex::LE_CLEAR_RESOLVING_LIST,

      OpCodeIndex::LE_READ_RESOLVING_LIST_SIZE,

      OpCodeIndex::LE_READ_PEER_RESOLVABLE_ADDRESS,

      OpCodeIndex::LE_READ_LOCAL_RESOLVABLE_ADDRESS,

      OpCodeIndex::LE_SET_ADDRESS_RESOLUTION_ENABLE,

      OpCodeIndex::LE_SET_RESOLVABLE_PRIVATE_ADDRESS_TIMEOUT,

      OpCodeIndex::LE_READ_MAXIMUM_DATA_LENGTH, OpCodeIndex::LE_READ_PHY,

      OpCodeIndex::LE_SET_DEFAULT_PHY, OpCodeIndex::LE_SET_PHY,

      // OpCodeIndex::LE_RECEIVER_TEST_V2,
@@ -357,7 +357,7 @@ static std::array<uint8_t, 64> SupportedCommands() { 
      // OpCodeIndex::LE_READ_TRANSMIT_POWER,

      OpCodeIndex::LE_READ_RF_PATH_COMPENSATION_POWER,

      OpCodeIndex::LE_WRITE_RF_PATH_COMPENSATION_POWER,

      // OpCodeIndex::LE_SET_PRIVACY_MODE,

      OpCodeIndex::LE_SET_PRIVACY_MODE,

      // OpCodeIndex::LE_RECEIVER_TEST_V3,

      // OpCodeIndex::LE_TRANSMITTER_TEST_V3,

      // OpCodeIndex::LE_SET_CONNECTIONLESS_CTE_TRANSMIT_PARAMETERS,