commit de1e37aad04640ef76f3c017b65adca087c7be0f
author Mike Lockwood <lockwood@android.com> Wed Aug 18 12:31:09 2010 -0400
committer Mike Lockwood <lockwood@android.com> Wed Aug 18 13:31:46 2010 -0400
tree a6d2f4b1a88bb9571d5ca0f452fdfbad9c931f7a
parent f211e5ab69b8f554b5e268699988640c2ec22255

MTP: Compatibility fixes for transferring strings

Change-Id: Ic06d754ee68b0389439cdc34f73adff0f2b33afa
Signed-off-by: Mike Lockwood <lockwood@android.com>

media/mtp/MtpDataPacket.cpp

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 @@
         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