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

Commit 2aeba34a authored by Hemant Gupta's avatar Hemant Gupta Committed by Andre Eisenbach
Browse files

MAP: Fix to handle incomplete message listing object sent. 

Usecase:
1) Establish Map Session with Remote Carkit.
2) Send MesageListing request from remote.
(Can be seen with getMessage Email, folderListing
email)
Note: Incomplete MessageListing object is sent only
when listing object size is between A and B where
A = (MaxPacketSize - HeaderArray_A_Size - 6) where
    HeaderArray_A contains only CONNECTION_ID and
    HeaderArray_A_Size = 5;
B = (MaxPacketSize - HeaderArray_B_size - 6) where
    HeaderArray_B contains CONNECTION_ID and APPLICATION
    PARAMETERS
    HeaderArray_B_Size = 37;

Issue:
Incomplete message listing object is sent in this rare
case.

Root Cause:
Application parameter header size was not taken into
consideration while sending MaxPacketSize when outputstream
(PrivateOutputStream) was created from ServerOperation.

Fix:
Create output stream instance (of ServerOperation) after all
reply headers are created in MAP side. This will set correct
MaxPacketSize in PrivateOutputStream.

Test: After following above steps issue is not seen.

Bug: 69726554
Change-Id: I2ea8864e4ff704935883044929f7d9225f2c47b4
parent 444e340b

src/com/android/bluetooth/map/BluetoothMapObexServer.java

+8 −8
Original line number Diff line number Diff line
@@ -1174,9 +1174,6 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
        }



        try {

            // Open the OBEX body stream

            outStream = op.openOutputStream();



            if (appParams.getMaxListCount() == BluetoothMapAppParams.INVALID_VALUE_PARAMETER) {

                appParams.setMaxListCount(1024);

            }
@@ -1229,6 +1226,8 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
            replyHeaders.setHeader(HeaderSet.APPLICATION_PARAMETER, outAppParams.encodeParams());

            op.sendHeaders(replyHeaders);



            // Open the OBEX body stream

            outStream = op.openOutputStream();

        } catch (IOException e) {

            Log.w(TAG, "sendMessageListingRsp: IOException - sending OBEX_HTTP_BAD_REQUEST", e);

            if (outStream != null) {
@@ -1366,9 +1365,6 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 


        // Check to see if we only need to send the size - hence no need to encode.

        try {

            // Open the OBEX body stream

            outStream = op.openOutputStream();



            if (appParams.getMaxListCount() == BluetoothMapAppParams.INVALID_VALUE_PARAMETER) {

                appParams.setMaxListCount(1024);

            }
@@ -1416,6 +1412,8 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
            replyHeaders.setHeader(HeaderSet.APPLICATION_PARAMETER, outAppParams.encodeParams());

            op.sendHeaders(replyHeaders);



            // Open the OBEX body stream

            outStream = op.openOutputStream();

        } catch (IOException e) {

            Log.w(TAG, "sendConvoListingRsp: IOException - sending OBEX_HTTP_BAD_REQUEST", e);

            if (outStream != null) {
@@ -1524,7 +1522,6 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 


            if (maxListCount != 0) {

                outBytes = mCurrentFolder.encode(listStartOffset, maxListCount);

                outStream = op.openOutputStream();

            } else {

                // ESR08 specified that this shall only be included for MaxListCount=0

                outAppParams.setFolderListingSize(mCurrentFolder.getSubFolderCount());
@@ -1535,6 +1532,9 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
            replyHeaders.setHeader(HeaderSet.APPLICATION_PARAMETER, outAppParams.encodeParams());

            op.sendHeaders(replyHeaders);



            if (maxListCount != 0) {

                outStream = op.openOutputStream();

            }

        } catch (IOException e1) {

            Log.w(TAG, "sendFolderListingRsp: IOException"

                    + " - sending OBEX_HTTP_BAD_REQUEST Exception:", e1);
@@ -1723,7 +1723,6 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 


        try {

            outBytes = mOutContent.getMessage(handle, appParams, mCurrentFolder, version);

            outStream = op.openOutputStream();



            // If it is a fraction request of Email message, set header before responding

            if ((BluetoothMapUtils.getMsgTypeFromHandle(handle).equals(TYPE.EMAIL)
@@ -1742,6 +1741,7 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
                            + "set FRACTION_DELIVER_LAST header");

                }

            }

            outStream = op.openOutputStream();



        } catch (IOException e) {

            Log.w(TAG, "sendGetMessageRsp: IOException - sending OBEX_HTTP_BAD_REQUEST", e);