Merge "Allow native crash name to contain spaces"

2 files changed, 14 insertions, 1 deletions

diff --git a/src/com/android/loganalysis/parser/NativeCrashParser.java b/src/com/android/loganalysis/parser/NativeCrashParser.java
index be12a18..a954ba4 100644
--- a/src/com/android/loganalysis/parser/NativeCrashParser.java
+++ b/src/com/android/loganalysis/parser/NativeCrashParser.java
@@ -32,7 +32,7 @@ public class NativeCrashParser implements IParser {
     private static final Pattern FINGERPRINT = Pattern.compile("^Build fingerprint: '(.*)'$");
     /** Matches: pid: 957, tid: 963  >>> com.android.camera <<< */
     private static final Pattern APP = Pattern.compile(
-            "^pid: (\\d+), tid: (\\d+)(, name: \\S+)?  >>> (\\S+) <<<$");
+            "^pid: (\\d+), tid: (\\d+)(, name: .+)?  >>> (\\S+) <<<$");
 
 
     /**
diff --git a/tests/src/com/android/loganalysis/parser/NativeCrashParserTest.java b/tests/src/com/android/loganalysis/parser/NativeCrashParserTest.java
index 06b9547..4e82c8f 100644
--- a/tests/src/com/android/loganalysis/parser/NativeCrashParserTest.java
+++ b/tests/src/com/android/loganalysis/parser/NativeCrashParserTest.java
@@ -176,5 +176,18 @@ public class NativeCrashParserTest extends TestCase {
         assertEquals(2058, nc.getPid().intValue());
         assertEquals(2523, nc.getTid().intValue());
         assertEquals("com.google.android.browser", nc.getApp());
+
+        lines = Arrays.asList(
+                "*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***",
+                "Build fingerprint: 'google/soju/crespo:4.0.4/IMM76D/299849:userdebug/test-keys'",
+                "pid: 2058, tid: 2523, name: Atlas Worker #1  >>> com.google.android.browser <<<",
+                "signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 00000000");
+
+        nc = new NativeCrashParser().parse(lines);
+        assertNotNull(nc);
+
+        assertEquals(2058, nc.getPid().intValue());
+        assertEquals(2523, nc.getTid().intValue());
+        assertEquals("com.google.android.browser", nc.getApp());
     }
 }