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 "Allow non-zero HCI interface numbers" into main am: 13c04c29cc

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

Change-Id: I82faa19507ff1b284fa92df68d16e2ae3fe2cc52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongguang Chen
2023-12-08 00:01:11 +00:00
committed by Automerger Merge Worker
parent c3e1e032a9 13c04c29cc
commit 8988050362
1 changed files with 6 additions and 5 deletions
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; (struct mgmt_ev_read_index_list*)ev.data;
for (int i = 0; i < data->num_controllers; i++) { for (int i = 0; i < data->num_controllers; i++) {
if (data->index[i] == hci_interface) { if (data->index[i] >= hci_interface) {
ALOGI("hci interface %d found", hci_interface); ALOGI("hci interface %d found", data->index[i]);
ret = 0; ret = data->index[i];
goto end; goto end;
} }
} }
@@ -253,8 +253,9 @@ int NetBluetoothMgmt::openHci(int hci_interface) {
rfkill(1); rfkill(1);
// Wait for the HCI interface to complete initialization or to come online. // Wait for the HCI interface to complete initialization or to come online.
if (waitHciDev(hci_interface)) { hci_interface = waitHciDev(hci_interface);
ALOGE("hci interface %d not found", hci_interface); if (hci_interface < 0) {
ALOGE("hci interface not found");
return -1; return -1;
} }