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 | de1e37aad04640ef76f3c017b65adca087c7be0f (patch) | |
| tree | a6d2f4b1a88bb9571d5ca0f452fdfbad9c931f7a /media/mtp/MtpStringBuffer.cpp | |
| parent | f211e5ab69b8f554b5e268699988640c2ec22255 (diff) | |
| download | frameworks_av-de1e37aad04640ef76f3c017b65adca087c7be0f.zip frameworks_av-de1e37aad04640ef76f3c017b65adca087c7be0f.tar.gz frameworks_av-de1e37aad04640ef76f3c017b65adca087c7be0f.tar.bz2 | |
MTP: Compatibility fixes for transferring strings
Change-Id: Ic06d754ee68b0389439cdc34f73adff0f2b33afa
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpStringBuffer.cpp')
| -rw-r--r-- | media/mtp/MtpStringBuffer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/mtp/MtpStringBuffer.cpp b/media/mtp/MtpStringBuffer.cpp index 2d3cf69..8bf6731 100644 --- a/media/mtp/MtpStringBuffer.cpp +++ b/media/mtp/MtpStringBuffer.cpp @@ -112,7 +112,7 @@ void MtpStringBuffer::readFromPacket(MtpDataPacket* packet) { void MtpStringBuffer::writeToPacket(MtpDataPacket* packet) const { int count = mCharCount; const uint8_t* src = mBuffer; - packet->putUInt8(count); + packet->putUInt8(count > 0 ? count + 1 : 0); // expand utf8 to 16 bit chars for (int i = 0; i < count; i++) { @@ -133,6 +133,9 @@ void MtpStringBuffer::writeToPacket(MtpDataPacket* packet) const { } packet->putUInt16(ch); } + // only terminate with zero if string is not empty + if (count > 0) + packet->putUInt16(0); } } // namespace android |