diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2021-06-04 14:19:33 -0700 |
|---|---|---|
| committer | William Escande <wescande@google.com> | 2021-06-22 18:15:16 +0200 |
| commit | 6338fb0d7fe1f34e853683dd17d18caf35a2a612 (patch) | |
| tree | 454e877728eda6e21bc682bad6142698efe79a82 /obex | |
| parent | 4db95cceb9e429be3ac01986b3c2c2a27eb9c0e1 (diff) | |
Set max transmit packet size for OBEX packets to the max if they exceed the
max allowed packet size
Tag: #feature
Bug: 187174891
Test: Manual
Merged-In: I80422e03d14958f2ea95327f95d010c747948e2c
Change-Id: I80422e03d14958f2ea95327f95d010c747948e2c
Diffstat (limited to 'obex')
| -rw-r--r-- | obex/javax/obex/ObexHelper.java | 14 | ||||
| -rw-r--r-- | obex/javax/obex/ObexTransport.java | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/obex/javax/obex/ObexHelper.java b/obex/javax/obex/ObexHelper.java index 478297f2a3c9..843793ad98f8 100644 --- a/obex/javax/obex/ObexHelper.java +++ b/obex/javax/obex/ObexHelper.java @@ -34,6 +34,8 @@ package javax.obex; +import android.util.Log; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -43,7 +45,6 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import android.util.Log; /** * This class defines a set of helper methods for the implementation of Obex. @@ -1083,11 +1084,12 @@ public final class ObexHelper { } private static int validateMaxPacketSize(int size) { - if(VDBG && (size > MAX_PACKET_SIZE_INT)) Log.w(TAG, - "The packet size supported for the connection (" + size + ") is larger" - + " than the configured OBEX packet size: " + MAX_PACKET_SIZE_INT); - if(size != -1) { - if(size < LOWER_LIMIT_MAX_PACKET_SIZE) { + if (VDBG && (size > MAX_PACKET_SIZE_INT)) { + Log.w(TAG, "The packet size supported for the connection (" + size + ") is larger" + + " than the configured OBEX packet size: " + MAX_PACKET_SIZE_INT); + } + if (size != -1 && size < MAX_PACKET_SIZE_INT) { + if (size < LOWER_LIMIT_MAX_PACKET_SIZE) { throw new IllegalArgumentException(size + " is less that the lower limit: " + LOWER_LIMIT_MAX_PACKET_SIZE); } diff --git a/obex/javax/obex/ObexTransport.java b/obex/javax/obex/ObexTransport.java index a5a75f55f553..4cef0b33df4f 100644 --- a/obex/javax/obex/ObexTransport.java +++ b/obex/javax/obex/ObexTransport.java @@ -81,6 +81,8 @@ public interface ObexTransport { * size. Therefore this value shall not change. * For RFCOMM or other transport types where the OBEX packets size * is unrelated to the transport packet size, return -1; + * Exception can be made (like PBAP transport) with a smaller value + * to avoid bad effect on other profiles using the RFCOMM; * @return the maximum allowed OBEX packet that can be send over * the transport. Or -1 in case of don't care. */ |