summaryrefslogtreecommitdiffstats
path: root/obex
diff options
context:
space:
mode:
authorHemant Gupta <hemantg@codeaurora.org>2015-11-05 14:12:01 +0530
committerSteve Kondik <steve@cyngn.com>2016-01-23 23:28:16 -0800
commit3db159dbd2b42bfd2896106b9ab7d97c472742e0 (patch)
tree80dff2697b07b71828e57f4d3c1caa462ee72cd7 /obex
parentab15943170dec0ed111c0f86456e49e037e0bed4 (diff)
downloadframeworks_base-3db159dbd2b42bfd2896106b9ab7d97c472742e0.zip
frameworks_base-3db159dbd2b42bfd2896106b9ab7d97c472742e0.tar.gz
frameworks_base-3db159dbd2b42bfd2896106b9ab7d97c472742e0.tar.bz2
Bluetooth: OBEX: Don't close transport when obex is disconnected
A case when remote device has disconnected obex connection, but has still kept the transport (L2CAP/RFCOMM) open. In such cases obex server was unnecessary assuming that transport would be disconnected so was informing registered users that transport has been disconnected, which was leading to issues on new obex connect on same transport channel from remote obex client. This patch removes check to break out of loop after obex disconnection, as that is already handled in case when read would return -1 in case transport is closed. Change-Id: Ic1682ce77c07cf2e43da09dc95fff2214338f758 CRs-Fixed: 935761
Diffstat (limited to 'obex')
-rw-r--r--obex/javax/obex/ServerSession.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/obex/javax/obex/ServerSession.java b/obex/javax/obex/ServerSession.java
index 34a75f4..33b0bde 100644
--- a/obex/javax/obex/ServerSession.java
+++ b/obex/javax/obex/ServerSession.java
@@ -104,7 +104,6 @@ public final class ServerSession extends ObexSession implements Runnable {
case ObexHelper.OBEX_OPCODE_DISCONNECT:
handleDisconnectRequest();
- done = true;
break;
case ObexHelper.OBEX_OPCODE_GET:
@@ -125,6 +124,7 @@ public final class ServerSession extends ObexSession implements Runnable {
break;
case -1:
+ Log.v(TAG, "Read request returned -1, exiting from loop");
done = true;
break;