diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-10-27 16:18:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-27 16:18:07 -0700 |
| commit | 6a428e39d4083e887d577835cd2ad32052d129c6 (patch) | |
| tree | 7e0a35fae2dc0f37150ef141725ccb0af6d77d80 | |
| parent | ad4c609858923ff8f597f8f8eb67eddf2fcc54be (diff) | |
| parent | 4507b177c35cfd918dba1cdc325fae3688fb7bd2 (diff) | |
| download | frameworks_base-6a428e39d4083e887d577835cd2ad32052d129c6.zip frameworks_base-6a428e39d4083e887d577835cd2ad32052d129c6.tar.gz frameworks_base-6a428e39d4083e887d577835cd2ad32052d129c6.tar.bz2 | |
Merge "Bluetooth OBEX timeout problem."
| -rw-r--r-- | obex/javax/obex/ServerOperation.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/obex/javax/obex/ServerOperation.java b/obex/javax/obex/ServerOperation.java index 07a3a53..d1476d2 100644 --- a/obex/javax/obex/ServerOperation.java +++ b/obex/javax/obex/ServerOperation.java @@ -397,11 +397,13 @@ public final class ServerOperation implements Operation, BaseStream { && (headerID != ObexHelper.OBEX_OPCODE_GET_FINAL)) { if (length > 3) { - byte[] temp = new byte[length]; + byte[] temp = new byte[length - 3]; + // First three bytes already read, compensating for this bytesReceived = mInput.read(temp); - while (bytesReceived != length) { - bytesReceived += mInput.read(temp, bytesReceived, length - bytesReceived); + while (bytesReceived != temp.length) { + bytesReceived += mInput.read(temp, bytesReceived, + temp.length - bytesReceived); } } |