Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Bluetooth: Send GET request as single packet\"

Browse Source 
am: 3d20e6f90f

Change-Id: I963d90c0b336e60f966fabf858dbc4ab2baf355f
This commit is contained in:
AnubhavGupta
2016-06-21 20:47:32 +00:00
committed by android-build-merger
parent 8fb95f0fb3 3d20e6f90f
commit 564166458e
1 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
obex/javax/obex/ClientOperation.java
View File

@@ -632,8 +632,10 @@ public final class ClientOperation implements Operation, BaseStream {
if (mGetOperation) { if (mGetOperation) {
if (!mOperationDone) { if (!mOperationDone) {
if (!mGetFinalFlag) {
mReplyHeader.responseCode = ResponseCodes.OBEX_HTTP_CONTINUE; mReplyHeader.responseCode = ResponseCodes.OBEX_HTTP_CONTINUE;
while ((more) && (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE)) { while ((more) && (mReplyHeader.responseCode ==
ResponseCodes.OBEX_HTTP_CONTINUE)) {
more = sendRequest(ObexHelper.OBEX_OPCODE_GET); more = sendRequest(ObexHelper.OBEX_OPCODE_GET);
} }
// For GET we need to loop until all headers have been sent, // For GET we need to loop until all headers have been sent,
@@ -648,6 +650,15 @@ public final class ClientOperation implements Operation, BaseStream {
} else { } else {
checkForSrm(); checkForSrm();
} }
} else {
more = sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL);
if (more) {
throw new IOException("FINAL_GET forced, data didn't fit into one packet");
}
mOperationDone = true;
}
} }
} else { } else {
// PUT operation // PUT operation
@@ -705,7 +716,15 @@ public final class ClientOperation implements Operation, BaseStream {
if (mPrivateInput == null) { if (mPrivateInput == null) {
mPrivateInput = new PrivateInputStream(this); mPrivateInput = new PrivateInputStream(this);
} }
if (!mGetFinalFlag) {
sendRequest(ObexHelper.OBEX_OPCODE_GET); sendRequest(ObexHelper.OBEX_OPCODE_GET);
} else {
sendRequest(ObexHelper.OBEX_OPCODE_GET_FINAL);
}
if (mReplyHeader.responseCode != ResponseCodes.OBEX_HTTP_CONTINUE) {
mOperationDone = true;
}
return true; return true;
} else if (mOperationDone) { } else if (mOperationDone) {