Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1a8f7a authored Apr 19, 2011 by Jaikumar Ganesh Committed by Android Code Review Apr 19, 2011

Merge "Unable to push files to Windows 7"

parents 08d9d9a4 e83b744d

obex/javax/obex/ClientSession.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -449,8 +449,8 @@ public final class ClientSession extends ObexSession {
		maxPacketSize = (mInput.read() << 8) + mInput.read();

		//check with local max size
		if (maxPacketSize > ObexHelper.MAX_PACKET_SIZE_INT) {
		maxPacketSize = ObexHelper.MAX_PACKET_SIZE_INT;
		if (maxPacketSize > ObexHelper.MAX_CLIENT_PACKET_SIZE) {
		maxPacketSize = ObexHelper.MAX_CLIENT_PACKET_SIZE;
		}

		if (length > 7) {

obex/javax/obex/ObexHelper.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,12 @@ public final class ObexHelper {
		*/
		public static final int MAX_PACKET_SIZE_INT = 0xFFFE;

		/**
		* Temporary workaround to be able to push files to Windows 7.
		* TODO: Should be removed as soon as Microsoft updates their driver.
		*/
		public static final int MAX_CLIENT_PACKET_SIZE = 0xFC00;

		public static final int OBEX_OPCODE_CONNECT = 0x80;

		public static final int OBEX_OPCODE_DISCONNECT = 0x81;