Skip to content

Commit

Permalink
BT: Fix opp file transfer failure.
Browse files Browse the repository at this point in the history
It is regression caused by CR2709979. If user cancels file transfer,
further file transfers will fail.

Cause: For l2cap client socket, socket->psm is reset to zero.
In on_l2cap_close, socket check will fail.
Fix: socket->psm is remote psm for client.

CRs-Fixed: 2720892
Change-Id: I1354949bbcc011e8f3069d86b7aa9de114f126f4
  • Loading branch information
xiaowang authored and Gerrit - the friendly Code Review server committed Jul 1, 2020
1 parent 2137d2f commit dc5b964
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion bta/jv/bta_jv_act.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ void bta_jv_l2cap_connect(tBTA_JV_MSG* p_data) {
p_cb->handle = handle;
p_cb->p_cback = cc->p_cback;
p_cb->l2cap_socket_id = cc->l2cap_socket_id;
p_cb->psm = 0; /* not a server */
p_cb->psm = cc->remote_psm; /* remote psm for client */
p_cb->sec_id = sec_id;
p_cb->state = BTA_JV_ST_CL_OPENING;
} else {
Expand Down

0 comments on commit dc5b964

Please sign in to comment.