commit 3ac3170a4be18c0a9539fff66cb0ce07a67175e5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 16 12:59:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 16 12:59:16 2017 +0000
tree 3c35a640a69df2572fbd9f51b484a8c6145eb77c
parent e0ba81110a7070b3a7a80c14014a1fc0a4b9b982
parent 3fba4935a7d2353f6f3ec1091729e3509ba73d41

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

obex/javax/obex/ServerSession.java

diff --git a/obex/javax/obex/ServerSession.java b/obex/javax/obex/ServerSession.java
index acee5dd..3831cf7 100644
--- a/obex/javax/obex/ServerSession.java
+++ b/obex/javax/obex/ServerSession.java
@@ -658,6 +658,11 @@
          */
         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];