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

Commit d13e125a authored by Cheney Ni's avatar Cheney Ni Committed by android-build-merger
Browse files

Merge "Ignore SDP failure while bonding if SDP was not attempted" am: 10b081fc am: 9c25f2b2 

am: cfaadadf

Change-Id: Id19b4651a4b703d4f3e2a3e53d06fbf4e5c47149
parents b17f3047 cfaadadf

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;