commit 13c04c29cc83de40dbb7dd391469c28f7babd1eb
author Hongguang Chen <hgchen@google.com> Thu Dec 07 23:29:23 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 07 23:29:23 2023 +0000
tree f1b7b30a475897f1b0f7dc4fda501394211250fe
parent 40f1230a1d4d16d574aeacac84d1fb4e3b0150b7
parent c59d2d80ee1e50c432567ee810f99044a3d18142

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

bluetooth/aidl/default/net_bluetooth_mgmt.cpp

diff --git a/bluetooth/aidl/default/net_bluetooth_mgmt.cpp b/bluetooth/aidl/default/net_bluetooth_mgmt.cpp
index 937cd57..0699781 100644
--- a/bluetooth/aidl/default/net_bluetooth_mgmt.cpp
+++ b/bluetooth/aidl/default/net_bluetooth_mgmt.cpp
@@ -162,9 +162,9 @@
           (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 @@
   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;
   }