summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-02-26 06:20:08 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-02-26 06:20:08 -0800
commit271d23eba537d88bf3572bae301671094b54a0d3 (patch)
tree57cefab071eed4398b6357da13e8f64d61acabc5
parent331108b7103b252c9d41c210a6872b29743dc8f4 (diff)
parent58a8b99cab3a885d4f92e2bff6b8343cd020a6f9 (diff)
downloadandroid_system_bt-271d23eba537d88bf3572bae301671094b54a0d3.tar.gz
android_system_bt-271d23eba537d88bf3572bae301671094b54a0d3.tar.bz2
android_system_bt-271d23eba537d88bf3572bae301671094b54a0d3.zip
Merge "Bluetooth: Clean up l2cap socket properly on closure"
-rw-r--r--btif/src/btif_sock_l2cap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/btif/src/btif_sock_l2cap.c b/btif/src/btif_sock_l2cap.c
index de8bc4d5a..93ba9be61 100644
--- a/btif/src/btif_sock_l2cap.c
+++ b/btif/src/btif_sock_l2cap.c
@@ -284,6 +284,11 @@ static void btsock_l2cap_free_l(l2cap_socket *sock)
} else {
BTA_JvFreeChannel(sock->channel, BTA_JV_CONN_TYPE_L2CAP);
}
+ if(!sock->fixed_chan) {
+ APPL_TRACE_DEBUG(" stopping l2cap server chnl %d", sock->channel);
+ BTA_JvL2capStopServer ( sock->channel, (void*)sock->id);
+ }
+
}
APPL_TRACE_DEBUG("SOCK_LIST: free(id = %d)", sock->id);