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

Commit 10b081fc authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Ignore SDP failure while bonding if SDP was not attempted"

parents 555a8d03 22062116

system/btif/src/btif_dm.cc

+9 −4
Original line number Diff line number Diff line
@@ -1397,10 +1397,15 @@ static void btif_dm_search_services_evt(uint16_t event, char* p_param) { 
      if ((p_data->disc_res.result != BTA_SUCCESS) &&

          (pairing_cb.state == BT_BOND_STATE_BONDING) &&

          (pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING)) {

        if (pairing_cb.sdp_attempts) {

          BTIF_TRACE_WARNING("%s: SDP failed after bonding re-attempting",

                             __func__);

          pairing_cb.sdp_attempts++;

          btif_dm_get_remote_services(bd_addr);

        } else {

          BTIF_TRACE_WARNING("%s: SDP triggered by someone failed when bonding",

                             __func__);

        }

        return;

      }

      prop.type = BT_PROPERTY_UUIDS;