diff --git a/src/com/android/loganalysis/item/KernelLogItem.java b/src/com/android/loganalysis/item/KernelLogItem.java index 60ed4de74bfbf9968d98c8f4713102f7fd19ce93..81c84ce72bd28d132bea06b6495b8783177aa5f3 100644 --- a/src/com/android/loganalysis/item/KernelLogItem.java +++ b/src/com/android/loganalysis/item/KernelLogItem.java @@ -51,6 +51,8 @@ public class KernelLogItem extends GenericItem { public KernelLogItem() { super(ATTRIBUTES); + setAttribute(START_TIME, new Double(0.0)); + setAttribute(STOP_TIME, new Double(0.0)); setAttribute(EVENTS, new ItemList()); } diff --git a/src/com/android/loganalysis/parser/BugreportParser.java b/src/com/android/loganalysis/parser/BugreportParser.java index dac1f53359d2942a5a2817f36e1db04779612b7b..ec033d53834c3dc7c30a629fdbbe3b596412cfa9 100644 --- a/src/com/android/loganalysis/parser/BugreportParser.java +++ b/src/com/android/loganalysis/parser/BugreportParser.java @@ -245,6 +245,8 @@ public class BugreportParser extends AbstractSectionParser { MiscKernelLogItem item = new MiscKernelLogItem(); item.setStack("Last boot reason: " + bootreason.trim()); item.setCategory(KernelLogParser.KERNEL_RESET); + item.setPreamble(""); + item.setEventTime(0.0); lastKmsg.addEvent(item); } m = KernelLogParser.GOOD_BOOTREASONS.matcher(bootreason); @@ -261,6 +263,8 @@ public class BugreportParser extends AbstractSectionParser { MiscKernelLogItem unknownReset = new MiscKernelLogItem(); unknownReset.setStack("Unknown reason"); unknownReset.setCategory(KernelLogParser.KERNEL_RESET); + unknownReset.setPreamble(""); + unknownReset.setEventTime(0.0); lastKmsg.addEvent(unknownReset); } } diff --git a/tests/src/com/android/loganalysis/parser/BugreportParserTest.java b/tests/src/com/android/loganalysis/parser/BugreportParserTest.java index b6e35b33ccf272fbe8e17943dcf47650bfc054a4..b47ea22d5edc55072e900bb35471020975f0f11d 100644 --- a/tests/src/com/android/loganalysis/parser/BugreportParserTest.java +++ b/tests/src/com/android/loganalysis/parser/BugreportParserTest.java @@ -18,17 +18,10 @@ package com.android.loganalysis.parser; import com.android.loganalysis.item.BugreportItem; import com.android.loganalysis.item.IItem; import com.android.loganalysis.item.MiscKernelLogItem; -import com.android.loganalysis.rule.RuleEngine; -import com.android.loganalysis.rule.RuleEngine.RuleType; import com.android.loganalysis.util.ArrayUtil; import junit.framework.TestCase; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -325,6 +318,10 @@ public class BugreportParserTest extends TestCase { assertEquals("Last boot reason: hw_reset", bugreport.getLastKmsg().getEvents().get(0).getStack()); assertEquals("KERNEL_RESET", bugreport.getLastKmsg().getEvents().get(0).getCategory()); + assertEquals("", bugreport.getLastKmsg().getEvents().get(0).getPreamble()); + assertEquals(0.0, bugreport.getLastKmsg().getEvents().get(0).getEventTime()); + assertEquals(0.0, bugreport.getLastKmsg().getStartTime()); + assertEquals(0.0, bugreport.getLastKmsg().getStopTime()); } /**