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

Merge "OBEX: Fix PrivateOutputStream small write problem"

Browse Source
This commit is contained in:
Jaikumar Ganesh
2011-05-20 09:40:32 -07:00
committed by Android Code Review
parent 6c427617be a9c4c594ef
commit 848a1e3d85
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
obex/javax/obex/PrivateOutputStream.java
View File

@ -107,20 +107,17 @@ public final class PrivateOutputStream extends OutputStream {
ensureOpen(); ensureOpen();
mParent.ensureNotDone(); mParent.ensureNotDone();
if (count < mMaxPacketSize) { while ((mArray.size() + remainLength) >= mMaxPacketSize) {
mArray.write(buffer, offset, count); int bufferLeft = mMaxPacketSize - mArray.size();
} else { mArray.write(buffer, offset1, bufferLeft);
while (remainLength >= mMaxPacketSize) { offset1 += bufferLeft;
mArray.write(buffer, offset1, mMaxPacketSize); remainLength -= bufferLeft;
offset1 += mMaxPacketSize;
remainLength = count - offset1;
mParent.continueOperation(true, false); mParent.continueOperation(true, false);
} }
if (remainLength > 0) { if (remainLength > 0) {
mArray.write(buffer, offset1, remainLength); mArray.write(buffer, offset1, remainLength);
} }
} }
}
/** /**
* Reads the bytes that have been written to this stream. * Reads the bytes that have been written to this stream.