drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth OBEX timeout problem."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-11-01 10:46:36 -07:00
committed by Android Code Review
parent b1fa549a49 faf49b14a2
commit b6db2d5125
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
obex/javax/obex/ServerOperation.java
View File

@ -397,11 +397,13 @@ public final class ServerOperation implements Operation, BaseStream {
&& (headerID != ObexHelper.OBEX_OPCODE_GET_FINAL)) { && (headerID != ObexHelper.OBEX_OPCODE_GET_FINAL)) {
if (length > 3) { 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); bytesReceived = mInput.read(temp);
while (bytesReceived != length) { while (bytesReceived != temp.length) {
bytesReceived += mInput.read(temp, bytesReceived, length - bytesReceived); bytesReceived += mInput.read(temp, bytesReceived,
temp.length - bytesReceived);
} }
} }