diff options
| author | Erik Ljungberg <erik.ljungberg@sonyericsson.com> | 2011-03-22 07:58:43 +0100 |
|---|---|---|
| committer | Johan Redestig <johan.redestig@sonyericsson.com> | 2011-03-22 07:58:43 +0100 |
| commit | e83b744d7d0b3caaf8f5456b795331d5db2495a3 (patch) | |
| tree | 459d73f087be0d9d5d780da15bdf3ebb8eb685f0 /obex | |
| parent | d973bed36cb4d4da1d97f309119f4114f60e7171 (diff) | |
| download | frameworks_base-e83b744d7d0b3caaf8f5456b795331d5db2495a3.zip frameworks_base-e83b744d7d0b3caaf8f5456b795331d5db2495a3.tar.gz frameworks_base-e83b744d7d0b3caaf8f5456b795331d5db2495a3.tar.bz2 | |
Unable to push files to Windows 7
Windows 7 says it can handle the maximum OBEX packet size. However
if the maximum packet size is used the transfer will fail. This
should be fixed by Microsoft but until they do the only way to solve
this is to reduce the maximum packet size for the OBEX client.
Change-Id: I51975eec972395ae3f1f21cca236b223d0812ef3
Diffstat (limited to 'obex')
| -rw-r--r-- | obex/javax/obex/ClientSession.java | 4 | ||||
| -rw-r--r-- | obex/javax/obex/ObexHelper.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/obex/javax/obex/ClientSession.java b/obex/javax/obex/ClientSession.java index 0935383..27d8976 100644 --- a/obex/javax/obex/ClientSession.java +++ b/obex/javax/obex/ClientSession.java @@ -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) { diff --git a/obex/javax/obex/ObexHelper.java b/obex/javax/obex/ObexHelper.java index 1b66662..7852fe9 100644 --- a/obex/javax/obex/ObexHelper.java +++ b/obex/javax/obex/ObexHelper.java @@ -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; |