Fix manta watchdog reset not being detected.

Bug: 14445952
Change-Id: I52ef8fc3f9b78e4aba24f6c3f0fc166eafb06780

2 files changed, 15 insertions, 1 deletions

diff --git a/src/com/android/loganalysis/parser/KernelLogParser.java b/src/com/android/loganalysis/parser/KernelLogParser.java
index aa399e1..e240432 100644
--- a/src/com/android/loganalysis/parser/KernelLogParser.java
+++ b/src/com/android/loganalysis/parser/KernelLogParser.java
@@ -171,7 +171,7 @@ public class KernelLogParser implements IParser {
             "\\[MODEM_IF\\].*CRASH.*",
             "Last boot reason: (?:kernel_panic|rpm_err|hw_reset(?:$|\n)|wdog_.*|" +
             "tz_err|adsp_err|modem_err|mba_err|watchdogr?|Watchdog|Panic)",
-            "Last reset was system watchdog timer reset",
+            "Last reset was system watchdog timer reset.*",
         };
         for (String pattern : kernelResets) {
             mPatternUtil.addPattern(Pattern.compile(pattern), KERNEL_RESET);
diff --git a/tests/src/com/android/loganalysis/parser/KernelLogParserTest.java b/tests/src/com/android/loganalysis/parser/KernelLogParserTest.java
index 24e7ad7..118f3ff 100644
--- a/tests/src/com/android/loganalysis/parser/KernelLogParserTest.java
+++ b/tests/src/com/android/loganalysis/parser/KernelLogParserTest.java
@@ -198,4 +198,18 @@ public class KernelLogParserTest extends TestCase {
         assertEquals(KernelLogParser.SELINUX_DENIAL, selinuxItem.getCategory());
         assertEquals(SELINUX_DENIAL_STACK, selinuxItem.getStack());
     }
+
+    public void testMantaReset() {
+        final List<String> lines = Arrays.asList("[ 3281.347296] ---fimc_is_ischain_close(0)",
+                "[ 3281.432055] fimc_is_scalerc_video_close",
+                "[ 3281.432270] fimc_is_scalerp_video_close",
+                "[ 3287.688303] wm8994-codec wm8994-codec: FIFO error",
+                "",
+                "No errors detected",
+                "Last reset was system watchdog timer reset (RST_STAT=0x100000)");
+
+        KernelLogItem kernelLog = new KernelLogParser().parse(lines);
+        assertEquals(1, kernelLog.getEvents().size());
+        assertEquals(1, kernelLog.getMiscEvents(KernelLogParser.KERNEL_RESET).size());
+    }
 }