Merge "Indicate that a packet was truncated." am: 046160959c

am: e76c8020ba

Change-Id: I24adc5cda36ba74afa2bda3e86e13af834b15a2c

adb/adb_utils.cpp

@@ -157,7 +157,12 @@ bool mkdirs(const std::string& path) {
 }
 
 std::string dump_hex(const void* data, size_t byte_count) {
-    byte_count = std::min(byte_count, size_t(16));
+    size_t truncate_len = 16;
+    bool truncated = false;
+    if (byte_count > truncate_len) {
+        byte_count = truncate_len;
+        truncated = true;
+    }
 
     const uint8_t* p = reinterpret_cast<const uint8_t*>(data);
 
@@ -172,6 +177,10 @@ std::string dump_hex(const void* data, size_t byte_count) {
         line.push_back(isprint(ch) ? ch : '.');
     }
 
+    if (truncated) {
+        line += " [truncated]";
+    }
+
     return line;
 }