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

Commit c559f174 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4922203 from e20ce635 to pi-qpr1-release 

Change-Id: I9637eb53d2dc079f443932ff694308a93293f35b
parents 8f026560 e20ce635

system/btif/src/btif_dm.cc

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

      if ((p_data->disc_res.result != BTA_SUCCESS) &&

          (pairing_cb.state == BT_BOND_STATE_BONDING) &&

          (pairing_cb.state == BT_BOND_STATE_BONDING) &&

          (pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING)) {

          (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",

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

                             __func__);

                             __func__);

          pairing_cb.sdp_attempts++;

          pairing_cb.sdp_attempts++;

          btif_dm_get_remote_services(bd_addr);

          btif_dm_get_remote_services(bd_addr);

        } else {

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

                             __func__);

        }

        return;

        return;

      }

      }

      prop.type = BT_PROPERTY_UUIDS;

      prop.type = BT_PROPERTY_UUIDS;