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

Commit bdfeff12 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 6c4c6a03: am 1500574e: Merge "Revert "Bluetooth: MAP: Do not set body... 

am 6c4c6a03: am 1500574e: Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev

* commit '6c4c6a03':
  Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"
parents c7f9d394 6c4c6a03

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

+2 −6
Original line number Diff line number Diff line
@@ -487,9 +487,7 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
                listSize = mOutContent.msgListingSize(folderName, appParams);

                hasUnread = mOutContent.msgListingHasUnread(folderName, appParams);

                outAppParams.setMessageListingSize(listSize);

                if(V) Log.v(TAG, "not setting body and end of body header");

                op.noBodyHeader();

                op.noEndofBody();

            }



            // Build the application parameter header
@@ -584,12 +582,10 @@ public class BluetoothMapObexServer extends ServerRequestHandler { 
            if(maxListCount == BluetoothMapAppParams.INVALID_VALUE_PARAMETER)

                maxListCount = 1024;



            if(maxListCount != 0) {

            if(maxListCount != 0)

            {

                outBytes = mCurrentFolder.encode(listStartOffset, maxListCount);

                outStream = op.openOutputStream();

            } else {

                op.noBodyHeader();

                op.noEndofBody();

            }



            // Build and set the application parameter header