Merge "Bluetooth OBEX timeout problem."

Jean-Baptiste Queru · Android Code Review · commit b6db2d512551 · 2010-11-01T10:46:36.000-07:00
diff --git a/obex/javax/obex/ServerOperation.java b/obex/javax/obex/ServerOperation.java
@@ -397,11 +397,13 @@ public synchronized boolean sendReply(int type) throws IOException {
                     && (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);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -397,11 +397,13 @@ public synchronized boolean sendReply(int type) throws IOException {`
`397`	`397`	`&& (headerID != ObexHelper.OBEX_OPCODE_GET_FINAL)) {`
`398`	`398`
`399`	`399`	`if (length > 3) {`
`400`		`- byte[] temp = new byte[length];`
	`400`	`+ byte[] temp = new byte[length - 3];`
	`401`	`+ // First three bytes already read, compensating for this`
`401`	`402`	`bytesReceived = mInput.read(temp);`
`402`	`403`
`403`		`- while (bytesReceived != length) {`
`404`		`- bytesReceived += mInput.read(temp, bytesReceived, length - bytesReceived);`
	`404`	`+ while (bytesReceived != temp.length) {`
	`405`	`+ bytesReceived += mInput.read(temp, bytesReceived,`
	`406`	`+ temp.length - bytesReceived);`
`405`	`407`	`}`
`406`	`408`	`}`
`407`	`409`