Initial unified commit for Android 14, with TrebleDroid GSI target, syncing up to 20240208

This commit is contained in:
Andy CrossGate Yan
2024-02-17 16:46:38 +08:00
commit e9902a4450
281 changed files with 169698 additions and 0 deletions

View File

@@ -0,0 +1,50 @@
From cd3589bfec212ae631772e0fdc984f21fc2bafe7 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
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 5576293017..c08ecab9d5 100644
--- a/system/gd/hci/controller.cc
+++ b/system/gd/hci/controller.cc
@@ -16,7 +16,6 @@
#include "hci/controller.h"
-#include <android-base/strings.h>
#include <future>
#include <memory>
#include <string>
@@ -37,8 +36,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;
@@ -301,15 +298,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<void> promise, CommandCompleteView view) {
--
2.34.1