Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev (1500574e) · Commits · e / os / android_packages_modules_Bluetooth

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