From 3ddebb45d3e48e581c0ac739b0b35b11f4737acc Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 20 Nov 2023 21:59:29 +0800 Subject: [PATCH] Revert "gd: hci: Allow disabling selected local commands" This reverts commit 543afb3dd2e2b5aa4f1931a973eb7c7df634aa69. --- system/gd/hci/controller.cc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/system/gd/hci/controller.cc b/system/gd/hci/controller.cc index 6facfef4c3..a6c16a9061 100644 --- a/system/gd/hci/controller.cc +++ b/system/gd/hci/controller.cc @@ -16,7 +16,6 @@ #include "hci/controller.h" -#include #include #include @@ -43,8 +42,6 @@ constexpr uint8_t kMinEncryptionKeySize = 7; // #define MIN_ENCRYPTION_KEY_SIZE constexpr bool kDefaultVendorCapabilitiesEnabled = true; static const std::string kPropertyVendorCapabilitiesEnabled = "bluetooth.core.le.vendor_capabilities.enabled"; -static const char kPropertyDisabledCommands[] = - "bluetooth.hci.disabled_commands"; using os::Handler; @@ -317,15 +314,6 @@ struct Controller::impl { ErrorCode status = complete_view.GetStatus(); ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str()); local_supported_commands_ = complete_view.GetSupportedCommands(); - - if (auto disabledCommands = os::GetSystemProperty(kPropertyDisabledCommands)) { - for (const auto& command : android::base::Split(*disabledCommands, ",")) { - uint16_t index = std::stoi(command); - uint16_t byte_index = index / 10; - uint16_t bit_index = index % 10; - local_supported_commands_[byte_index] &= ~(1 << bit_index); - } - } } void read_local_extended_features_complete_handler(std::promise promise, CommandCompleteView view) { -- 2.34.1