tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow non-zero HCI interface numbers" into main

Browse source
This commit is contained in:
Hongguang Chen 2023-12-07 23:29:23 +00:00 committed by Gerrit Code Review
commit 13c04c29cc
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bluetooth/aidl/default/net_bluetooth_mgmt.cpp
View file

@ -162,9 +162,9 @@ int NetBluetoothMgmt::waitHciDev(int hci_interface) {
(struct mgmt_ev_read_index_list*)ev.data;
for (int i = 0; i < data->num_controllers; i++) {
if (data->index[i] == hci_interface) {
ALOGI("hci interface %d found", hci_interface);
ret = 0;
if (data->index[i] >= hci_interface) {
ALOGI("hci interface %d found", data->index[i]);
ret = data->index[i];
goto end;
}
}
@ -253,8 +253,9 @@ int NetBluetoothMgmt::openHci(int hci_interface) {
rfkill(1);
// Wait for the HCI interface to complete initialization or to come online.
if (waitHciDev(hci_interface)) {
ALOGE("hci interface %d not found", hci_interface);
hci_interface = waitHciDev(hci_interface);
if (hci_interface < 0) {
ALOGE("hci interface not found");
return -1;
}