Merge "Add a whitespace character when scanning across tokens."

1 files changed, 6 insertions, 1 deletions

diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapDataImporter.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapDataImporter.java
index 9c53b18..e5f4fdb 100644
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapDataImporter.java
+++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/heap/NativeHeapDataImporter.java
@@ -190,9 +190,14 @@ public class NativeHeapDataImporter implements IRunnableWithProgress {
             }
 
             sb.append(token);
+
+            // We do not know the exact delimiter that was skipped over, but we know
+            // that there was atleast 1 whitespace. Add a single whitespace character
+            // to account for this.
+            sb.append(' ');
         }
 
-        return sb.toString();
+        return sb.toString().trim();
     }
 
     private boolean isUnresolved(String method, long address) {