Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation."

2017-02-16 12:59:15 +00:00
parent e0ba81110a 3fba4935a7
commit 3ac3170a4b
1 changed files with 5 additions and 0 deletions
--- a/obex/javax/obex/ServerSession.java
+++ b/obex/javax/obex/ServerSession.java
@@ -658,6 +658,11 @@ public final class ServerSession extends ObexSession implements Runnable {
         */
        byte[] sendData = new byte[totalLength];
        int maxRxLength = ObexHelper.getMaxRxPacketSize(mTransport);
+        if (maxRxLength > mMaxPacketLength) {
+            if(V) Log.v(TAG,"Set maxRxLength to min of maxRxServrLen:" + maxRxLength +
+                    " and MaxNegotiated from Client: " + mMaxPacketLength);
+            maxRxLength = mMaxPacketLength;
+        }
        sendData[0] = (byte)code;
        sendData[1] = length[2];
        sendData[2] = length[3];