diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-08-18 12:31:09 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-08-18 13:31:46 -0400 |
| commit | 9e837861b28b8186da0791c9a4e72f8a128a980c (patch) | |
| tree | b9ce4e065d7a87b4da96fcb9f26f901f95f32e92 /media/mtp/MtpDataPacket.cpp | |
| parent | 243efd2c573eea5ee571d619503e81be8de3ff9b (diff) | |
| download | frameworks_base-9e837861b28b8186da0791c9a4e72f8a128a980c.zip frameworks_base-9e837861b28b8186da0791c9a4e72f8a128a980c.tar.gz frameworks_base-9e837861b28b8186da0791c9a4e72f8a128a980c.tar.bz2 | |
MTP: Compatibility fixes for transferring strings
Change-Id: Ic06d754ee68b0389439cdc34f73adff0f2b33afa
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpDataPacket.cpp')
| -rw-r--r-- | media/mtp/MtpDataPacket.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp index 9bfd00f..27dc796 100644 --- a/media/mtp/MtpDataPacket.cpp +++ b/media/mtp/MtpDataPacket.cpp @@ -325,9 +325,12 @@ void MtpDataPacket::putString(const uint16_t* string) { else break; } - putUInt8(count); + putUInt8(count > 0 ? count + 1 : 0); for (int i = 0; i < count; i++) putUInt16(string[i]); + // only terminate with zero if string is not empty + if (count > 0) + putUInt16(0); } #ifdef MTP_DEVICE |