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

Commit 30cc4fd9 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Handle remote not supporting LL_SLAVE_FEATURE_REQ"

am: b68c126e

Change-Id: I15ab18d2f7aec748287c0420f143c4a57e8a0e4f
parents 01981e91 b68c126e
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -2561,8 +2561,9 @@ void btm_ble_read_remote_features_complete(uint8_t* p) {
  handle = handle & 0x0FFF;  // only 12 bits meaningful

  if (status != HCI_SUCCESS) {
    BTM_TRACE_ERROR("%s: failed for handle: 0x%04d", __func__, handle);
    return;
    BTM_TRACE_ERROR("%s: failed for handle: 0x%04d, status 0x%02x", __func__,
                    handle, status);
    if (status != HCI_ERR_UNSUPPORTED_REM_FEATURE) return;
  }

  int idx = btm_handle_to_acl_index(handle);
@@ -2571,7 +2572,9 @@ void btm_ble_read_remote_features_complete(uint8_t* p) {
    return;
  }

  if (status == HCI_SUCCESS) {
    STREAM_TO_ARRAY(btm_cb.acl_db[idx].peer_le_features, p, BD_FEATURES_LEN);
  }

  btsnd_hcic_rmt_ver_req(handle);
}