diff options
| author | Matthew Xie <mattx@google.com> | 2014-07-12 07:31:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-12 07:31:12 +0000 |
| commit | 5b4e66228f799c1187c28be59843e70974243e16 (patch) | |
| tree | d0a4701426fdd32f71f09a11e11f8aff67044d42 /src/com/android/bluetooth/map | |
| parent | 878cb162c0d823d6bb4e64f6d5da3770df3fb526 (diff) | |
| parent | 24b52ce786d8c5fa4bf1c4294ec9fbfd3738754f (diff) | |
| download | android_packages_apps_Bluetooth-5b4e66228f799c1187c28be59843e70974243e16.tar.gz android_packages_apps_Bluetooth-5b4e66228f799c1187c28be59843e70974243e16.tar.bz2 android_packages_apps_Bluetooth-5b4e66228f799c1187c28be59843e70974243e16.zip | |
am 24b52ce7: Merge "Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"" into klp-wireless-dev
* commit '24b52ce786d8c5fa4bf1c4294ec9fbfd3738754f':
Revert "Bluetooth: MAP: Do not set body header if maxlist count is 0"
Diffstat (limited to 'src/com/android/bluetooth/map')
| -rw-r--r-- | src/com/android/bluetooth/map/BluetoothMapObexServer.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapObexServer.java b/src/com/android/bluetooth/map/BluetoothMapObexServer.java index 62a007f65..37ccf4375 100644 --- a/src/com/android/bluetooth/map/BluetoothMapObexServer.java +++ b/src/com/android/bluetooth/map/BluetoothMapObexServer.java @@ -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 |