commit ce128ae66dc6d430aad09ad920133bc040d834c8
author Jean-Baptiste Queru <jbq@google.com> Mon Nov 01 10:53:09 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 01 10:53:09 2010 -0700
tree c7dfec883909f738a15c17f35b99a872e72f260f
parent a87cdd398fa8b46eb48b4f9a7a6b114a336e3bf2
parent b6db2d5125511284ee0962dd85d9be0099e51b22

am b6db2d51: Merge "Bluetooth OBEX timeout problem."

* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
  Bluetooth OBEX timeout problem.

obex/javax/obex/ServerOperation.java

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 @@
                     && (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);
                     }
                 }