Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bluetooth/aidl: Enable HCI reset in default hal only when running on emulator devices" into main am: 477100915e am: 6f2789f93c am: 72e2afa6c0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2700504

Change-Id: I4c382e36f5a3f760dba467d87eb10ea6af4347b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Henri Chataing
2023-08-10 03:11:44 +00:00
committed by Automerger Merge Worker
parent 0c3474c67a 72e2afa6c0
commit 9eaa0b83a3
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
bluetooth/aidl/default/BluetoothHci.cpp
View File

@@ -55,6 +55,19 @@ namespace aidl::android::hardware::bluetooth::impl {
void OnDeath(void* cookie);
std::optional<std::string> GetSystemProperty(const std::string& property) {
std::array<char, PROPERTY_VALUE_MAX> value_array{0};
auto value_len = property_get(property.c_str(), value_array.data(), nullptr);
if (value_len <= 0) {
return std::nullopt;
}
return std::string(value_array.data(), value_len);
}
bool starts_with(const std::string& str, const std::string& prefix) {
return str.compare(0, prefix.length(), prefix) == 0;
}
class BluetoothDeathRecipient {
public:
BluetoothDeathRecipient(BluetoothHci* hci) : mHci(hci) {}
@@ -232,8 +245,19 @@ ndk::ScopedAStatus BluetoothHci::initialize(
mDeathRecipient->LinkToDeath(mCb);
// TODO: This should not be necessary when the device implements rfkill.
reset();
// TODO: HCI Reset on emulators since the bluetooth controller
// cannot be powered on/off during the HAL setup; and the stack
// might received spurious packets/events during boottime.
// Proper solution would be to use bt-virtio or vsock to better
// control the link to rootcanal and the controller lifetime.
const std::string kBoardProperty = "ro.product.board";
const std::string kCuttlefishBoard = "cutf";
auto board_name = GetSystemProperty(kBoardProperty);
if (board_name.has_value() && (
starts_with(board_name.value(), "cutf") ||
starts_with(board_name.value(), "goldfish"))) {
reset();
}
mH4 = std::make_shared<H4Protocol>(
mFd,