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

Commit fc4f2803 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Remember what stage of service discovery are we during bonding" am: 69a8fbed 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2272447



Change-Id: I8930c86db53317a4b01f5eecf908127c2031f87e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00699238 69a8fbed

system/btif/src/btif_dm.cc

+73 −7
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ const bool enable_address_consolidate = true; // TODO remove 
#define ENCRYPTED_BREDR 2

#define ENCRYPTED_LE 4



typedef struct {

struct btif_dm_pairing_cb_t {

  bt_bond_state_t state;

  RawAddress static_bdaddr;

  RawAddress bd_addr;
@@ -157,7 +157,12 @@ typedef struct { 
  bool is_le_nc; /* LE Numeric comparison */

  btif_dm_ble_cb_t ble;

  uint8_t fail_reason;

} btif_dm_pairing_cb_t;



  enum ServiceDiscoveryState { NOT_STARTED, SCHEDULED, FINISHED };



  ServiceDiscoveryState gatt_over_le;

  ServiceDiscoveryState sdp_over_classic;

};



// TODO(jpawlowski): unify ?

// btif_dm_local_key_id_t == tBTM_BLE_LOCAL_ID_KEYS == tBTA_BLE_LOCAL_ID_KEYS
@@ -513,11 +518,15 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, 
  }



  if (state == BT_BOND_STATE_BONDING ||

      (state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts > 0)) {

    // Save state for the device is bonding or SDP.

      (state == BT_BOND_STATE_BONDED &&

       (pairing_cb.sdp_attempts > 0 ||

        pairing_cb.gatt_over_le ==

            btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED))) {

    // Save state for the device is bonding or SDP or GATT over LE discovery

    pairing_cb.state = state;

    pairing_cb.bd_addr = bd_addr;

  } else {

    LOG_INFO("clearing btif pairing_cb");

    pairing_cb = {};

  }

}
@@ -1110,9 +1119,16 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
        } else {

          bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED);

        }



        if (pairing_cb.sdp_over_classic ==

            btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED) {

          LOG_INFO("scheduling SDP for %s", ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

          pairing_cb.sdp_over_classic =

              btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED;

          btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);

        }

      }

    }

    // Do not call bond_state_changed_cb yet. Wait until remote service

    // discovery is complete

  } else {
@@ -1449,7 +1465,8 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
          pairing_cb.state == BT_BOND_STATE_BONDED &&

          pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING) {

        if (pairing_cb.sdp_attempts) {

          LOG_WARN("SDP failed after bonding re-attempting");

          LOG_WARN("SDP failed after bonding re-attempting for %s",

                   ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

          pairing_cb.sdp_attempts++;

          btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);

        } else {
@@ -1457,6 +1474,14 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
        }

        return;

      }



      if ((bd_addr == pairing_cb.bd_addr ||

           bd_addr == pairing_cb.static_bdaddr)) {

        LOG_INFO("SDP finished for %s:", ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

        pairing_cb.sdp_over_classic =

            btif_dm_pairing_cb_t::ServiceDiscoveryState::FINISHED;

      }



      prop.type = BT_PROPERTY_UUIDS;

      prop.len = 0;

      if ((p_data->disc_res.result == BTA_SUCCESS) &&
@@ -1533,6 +1558,7 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
        // Both SDP and bonding are done, clear pairing control block in case

        // it is not already cleared

        pairing_cb = {};

        LOG_INFO("clearing btif pairing_cb");

      }



      if (p_data->disc_res.num_uuids != 0 || num_eir_uuids != 0) {
@@ -1565,6 +1591,18 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
      if (event == BTA_DM_GATT_OVER_LE_RES_EVT) {

        LOG_INFO("New GATT over LE UUIDs for %s:",

                 ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

        if ((bd_addr == pairing_cb.bd_addr ||

             bd_addr == pairing_cb.static_bdaddr)) {

          if (pairing_cb.gatt_over_le !=

              btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED) {

            LOG_ERROR(

                "gatt_over_le should be SCHEDULED, did someone clear the "

                "control block for %s ?",

                ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

          }

          pairing_cb.gatt_over_le =

              btif_dm_pairing_cb_t::ServiceDiscoveryState::FINISHED;

        }

      } else {

        LOG_INFO("New GATT over SDP UUIDs for %s:",

                 ADDRESS_TO_LOGGABLE_CSTR(bd_addr));
@@ -1633,6 +1671,21 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event, 
      /* Send the event to the BTIF */

      GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb(

          BT_STATUS_SUCCESS, bd_addr, num_properties, prop);



      if ((bd_addr == pairing_cb.bd_addr ||

           bd_addr == pairing_cb.static_bdaddr) &&

          pairing_cb.sdp_over_classic !=

              btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED &&

          pairing_cb.gatt_over_le !=

              btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED) {

        // Both SDP and bonding are either done, or not scheduled, we are safe

        // to clear the service discovery part of CB.

        pairing_cb.gatt_over_le =

            btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED;

        pairing_cb.sdp_over_classic =

            btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED;

        LOG_INFO("clearing service discovery part of pairing_cb");

      }

    } break;



    case BTA_DM_DID_RES_EVT: {
@@ -3011,7 +3064,20 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
      state = BT_BOND_STATE_NONE;

    } else {

      btif_dm_save_ble_bonding_keys(bd_addr);



      if (pairing_cb.gatt_over_le ==

          btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED) {

        LOG_INFO("scheduling GATT discovery over LE for %s",

                 ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

        pairing_cb.gatt_over_le =

            btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED;

        btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_LE);

      } else {

        LOG_INFO(

            "skipping GATT discovery over LE - was already scheduled or "

            "finished for %s, state: %d",

            ADDRESS_TO_LOGGABLE_CSTR(bd_addr), pairing_cb.gatt_over_le);

      }

    }

  } else {

    /*Map the HCI fail reason  to  bt status  */