diff options
| author | Matthew Xie <mattx@google.com> | 2014-07-12 05:54:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-12 05:54:48 +0000 |
| commit | 878cb162c0d823d6bb4e64f6d5da3770df3fb526 (patch) | |
| tree | bb4dfd94ca1e6e7010f09b911b5d950d035b1a86 /src/com/android/bluetooth/map | |
| parent | 44499c6ba795ab59ad6387fa00e20537b3c5064e (diff) | |
| parent | c73bd48e5351a12103cb58a15fa9fc33825c9b07 (diff) | |
| download | android_packages_apps_Bluetooth-878cb162c0d823d6bb4e64f6d5da3770df3fb526.tar.gz android_packages_apps_Bluetooth-878cb162c0d823d6bb4e64f6d5da3770df3fb526.tar.bz2 android_packages_apps_Bluetooth-878cb162c0d823d6bb4e64f6d5da3770df3fb526.zip | |
am c73bd48e: Merge "Bluetooth: MAP: Do not set body header if maxlist count is 0" into klp-wireless-dev
* commit 'c73bd48e5351a12103cb58a15fa9fc33825c9b07':
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, 6 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/map/BluetoothMapObexServer.java b/src/com/android/bluetooth/map/BluetoothMapObexServer.java index 37ccf4375..62a007f65 100644 --- a/src/com/android/bluetooth/map/BluetoothMapObexServer.java +++ b/src/com/android/bluetooth/map/BluetoothMapObexServer.java @@ -487,7 +487,9 @@ 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 @@ -582,10 +584,12 @@ 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 |