Merge "OBEX: Include NameHeader in final PUT Server Response" (68ead2d0) · Commits · e / os / android_frameworks_base

btobex/javax/btobex/ServerSession.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -285,11 +285,22 @@ public final class ServerSession extends ObexSession implements Runnable {
	if (VERBOSE) Log.v(TAG, "handlePutRequest pre != HTTP_OK sendReply");		if (VERBOSE) Log.v(TAG, "handlePutRequest pre != HTTP_OK sendReply");
	op.sendReply(response, false, false);		op.sendReply(response, false, false);
	} else if (!op.isAborted) {		} else if (!op.isAborted) {
			String nameHeader = (String)op.replyHeader.getHeader(HeaderSet.NAME);
			if (!op.finalBitSet && nameHeader != null) {
			if (VERBOSE) Log.v(TAG, "handlePutRequest Saved: "+nameHeader);
			//Donot Include NameHeader in CONTINUE
			op.replyHeader.setHeader(HeaderSet.NAME, null);
			}
	// wait for the final bit		// wait for the final bit
	while (!op.finalBitSet) {		while (!op.finalBitSet) {
	if (VERBOSE) Log.v(TAG, "handlePutRequest pre looped sendReply");		if (VERBOSE) Log.v(TAG, "handlePutRequest pre looped sendReply");
	op.sendReply(ResponseCodes.OBEX_HTTP_CONTINUE, op.mSingleResponseActive, false);		op.sendReply(ResponseCodes.OBEX_HTTP_CONTINUE, op.mSingleResponseActive, false);
	}		}
			if (nameHeader != null) {
			if (VERBOSE) Log.v(TAG, "handlePutRequest SETHeader: "+nameHeader);
			//PUT NameHeader in Final Packet
			op.replyHeader.setHeader(HeaderSet.NAME, nameHeader);
			}
	op.sendReply(response, false,false);		op.sendReply(response, false,false);
	}		}
	} catch (Exception e) {		} catch (Exception e) {