Skip to content
Snippets Groups Projects
Commit 8438477a authored by Maxim Siniavine's avatar Maxim Siniavine
Browse files

Fix kernel reset message that gets generated from the bootreason property.

Change-Id: Ic7d77f9e4edee8e164ad3e03c452f220c7847ece
parent e9520897
Branches
No related tags found
No related merge requests found
...@@ -51,6 +51,8 @@ public class KernelLogItem extends GenericItem { ...@@ -51,6 +51,8 @@ public class KernelLogItem extends GenericItem {
public KernelLogItem() { public KernelLogItem() {
super(ATTRIBUTES); super(ATTRIBUTES);
setAttribute(START_TIME, new Double(0.0));
setAttribute(STOP_TIME, new Double(0.0));
setAttribute(EVENTS, new ItemList()); setAttribute(EVENTS, new ItemList());
} }
......
...@@ -245,6 +245,8 @@ public class BugreportParser extends AbstractSectionParser { ...@@ -245,6 +245,8 @@ public class BugreportParser extends AbstractSectionParser {
MiscKernelLogItem item = new MiscKernelLogItem(); MiscKernelLogItem item = new MiscKernelLogItem();
item.setStack("Last boot reason: " + bootreason.trim()); item.setStack("Last boot reason: " + bootreason.trim());
item.setCategory(KernelLogParser.KERNEL_RESET); item.setCategory(KernelLogParser.KERNEL_RESET);
item.setPreamble("");
item.setEventTime(0.0);
lastKmsg.addEvent(item); lastKmsg.addEvent(item);
} }
m = KernelLogParser.GOOD_BOOTREASONS.matcher(bootreason); m = KernelLogParser.GOOD_BOOTREASONS.matcher(bootreason);
...@@ -261,6 +263,8 @@ public class BugreportParser extends AbstractSectionParser { ...@@ -261,6 +263,8 @@ public class BugreportParser extends AbstractSectionParser {
MiscKernelLogItem unknownReset = new MiscKernelLogItem(); MiscKernelLogItem unknownReset = new MiscKernelLogItem();
unknownReset.setStack("Unknown reason"); unknownReset.setStack("Unknown reason");
unknownReset.setCategory(KernelLogParser.KERNEL_RESET); unknownReset.setCategory(KernelLogParser.KERNEL_RESET);
unknownReset.setPreamble("");
unknownReset.setEventTime(0.0);
lastKmsg.addEvent(unknownReset); lastKmsg.addEvent(unknownReset);
} }
} }
......
...@@ -18,17 +18,10 @@ package com.android.loganalysis.parser; ...@@ -18,17 +18,10 @@ package com.android.loganalysis.parser;
import com.android.loganalysis.item.BugreportItem; import com.android.loganalysis.item.BugreportItem;
import com.android.loganalysis.item.IItem; import com.android.loganalysis.item.IItem;
import com.android.loganalysis.item.MiscKernelLogItem; 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 com.android.loganalysis.util.ArrayUtil;
import junit.framework.TestCase; 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.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -325,6 +318,10 @@ public class BugreportParserTest extends TestCase { ...@@ -325,6 +318,10 @@ public class BugreportParserTest extends TestCase {
assertEquals("Last boot reason: hw_reset", assertEquals("Last boot reason: hw_reset",
bugreport.getLastKmsg().getEvents().get(0).getStack()); bugreport.getLastKmsg().getEvents().get(0).getStack());
assertEquals("KERNEL_RESET", bugreport.getLastKmsg().getEvents().get(0).getCategory()); 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());
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment