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

Commit 03c09ae1 authored by Juffin Alex Varghese's avatar Juffin Alex Varghese Committed by Steve Kondik
Browse files

Bluetooth-OBEX: Reduce the MTU size if default OBEX MTU > 8k 

Add a check for default OBEX MTU. If MTU is greater than 8k and
setMTU flag is true then reduce the MTU to 8k.

CRs-Fixed: 613931
Change-Id: I5785fd372241f682427ea3aca0b56ac747820d52
parent 8f26826b

obex/javax/obex/ClientSession.java

+3 −2
Original line number Diff line number Diff line
@@ -457,8 +457,9 @@ public final class ClientSession extends ObexSession { 
                maxPacketSize = (mInput.read() << 8) + mInput.read();



                //check with local max size

                if (setMTU) {

                    maxPacketSize = ObexHelper.A2DP_SCO_OBEX_MAX_CLIENT_PACKET_SIZE;

                if (setMTU && maxPacketSize > ObexHelper.A2DP_OBEX_MAX_CLIENT_PACKET_SIZE) {

                    maxPacketSize = ObexHelper.A2DP_OBEX_MAX_CLIENT_PACKET_SIZE;

                    setMTU = false;

                } else if (maxPacketSize > ObexHelper.MAX_CLIENT_PACKET_SIZE) {

                    maxPacketSize = ObexHelper.MAX_CLIENT_PACKET_SIZE;

                }

obex/javax/obex/ObexHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public final class ObexHelper { 
     * TODO: Should be removed as soon as Microsoft updates their driver.

     */

    public static final int MAX_CLIENT_PACKET_SIZE = 0xFC00;

    public static final int A2DP_SCO_OBEX_MAX_CLIENT_PACKET_SIZE = 0x2000;

    public static final int A2DP_OBEX_MAX_CLIENT_PACKET_SIZE = 0x2000;



    public static final int OBEX_OPCODE_CONNECT = 0x80;