drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

Browse Source 
* commit 'c34c88b948cb60c057bd2145df9f1b2091f3c894':
  Unable to push files to Windows 7
This commit is contained in:
Jaikumar Ganesh
2011-04-19 15:57:24 -07:00
committed by Android Git Automerger
parent 5ce9eb9a34 c34c88b948
commit 24a16e6c53
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
obex/javax/obex/ClientSession.java
View File

@ -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) {

6
obex/javax/obex/ObexHelper.java
View File

@ -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;