Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b267d292 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set max transmit packet size for OBEX packets to the max if they exceed... 

Merge "Set max transmit packet size for OBEX packets to the max if they exceed the max allowed packet size" into sc-dev am: e28794b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15054862

Change-Id: Idff17223ea3bf19076fcb451c1d33220970082b6
parents 38fac502 e28794b1

obex/javax/obex/ObexHelper.java

+8 −6
Original line number Diff line number Diff line
@@ -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,10 +1084,11 @@ 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"

        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 != -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);

obex/javax/obex/ObexTransport.java

+2 −0
Original line number Diff line number Diff line
@@ -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.

     */