Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dc3ff28 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Chris Manton
Browse files

Fix incorrect enum comparison of LE close reason 

The LE close reason is tGATT_DISCONN_REASON but it's compared against
tHCI_ERROR_CODE. Besides just being different types, they are also
backed by different primitives (u16 for gatt vs u8 for hci). This fails
in stricter build environments (i.e. ChromeOS).

Bug: 187836537
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I0f926b6fad9f20adde5e1e7ff89bcc7c8da01f93
parent 63205b58

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Diff line number Diff line
@@ -1625,7 +1625,7 @@ void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { 
  if (bta_hh_cb.cnt_num == 0 && bta_hh_cb.w4_disable) {

    bta_hh_disc_cmpl();

  } else if (kBTA_HH_LE_RECONN &&

             p_data->le_close.reason == HCI_ERR_CONNECTION_TOUT) {

             p_data->le_close.reason == GATT_CONN_TIMEOUT) {

    bta_hh_le_add_dev_bg_conn(p_cb, false);

  }

}