Merge "OBEX: Set Min maxPacketLength negotiated in CONNECT Operation." am: 3ac3170a4b am: 1112046506 am: ff3f4e72af

am: 853d024b98

Change-Id: I6655ce33890d65be844b7a8e471ebf12ed800a6c

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