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

Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case"

Browse Source 
am: edfb333a4d

Change-Id: I28de2826209a16b763d64a1b31381f748067789c
This commit is contained in:
Hemant Gupta
2017-11-29 20:17:31 +00:00
committed by android-build-merger
parent 70da38960c edfb333a4d
commit cca3c9bb01
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,7 +195,12 @@ public final class ServerOperation implements Operation, BaseStream {
if(!handleObexPacket(packet)) {
return;
}
if (!mHasBody) {
/* Don't Pre-Send continue when Remote requested for SRM
* Let the Application confirm.
*/
if (V) Log.v(TAG, "Get App confirmation if SRM ENABLED case: " + mSrmEnabled
+ " not hasBody case: " + mHasBody);
if (!mHasBody && !mSrmEnabled) {
while ((!mGetOperation) && (!finalBitSet)) {
sendReply(ResponseCodes.OBEX_HTTP_CONTINUE);
if (mPrivateInput.available() > 0) {
@@ -204,8 +209,13 @@ public final class ServerOperation implements Operation, BaseStream {
}
}
}
while ((!mGetOperation) && (!finalBitSet) && (mPrivateInput.available() == 0)) {
/* Don't Pre-Send continue when Remote requested for SRM
* Let the Application confirm.
*/
if (V) Log.v(TAG, "Get App confirmation if SRM ENABLED case: " + mSrmEnabled
+ " not finalPacket: " + finalBitSet + " not GETOp Case: " + mGetOperation);
while ((!mSrmEnabled) && (!mGetOperation) && (!finalBitSet)
&& (mPrivateInput.available() == 0)) {
sendReply(ResponseCodes.OBEX_HTTP_CONTINUE);
if (mPrivateInput.available() > 0) {
break;