summaryrefslogtreecommitdiff
path: root/src/com/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-04-13 19:30:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-04-13 19:30:15 +0000
commit6f9812173359fe40cc3a82c67fb78ac567d81c26 (patch)
treedcbc6e0fb5d36242990c4775628342de9fc54c2b /src/com/android
parentebbf623041a84461ed22411ac9f6644365c1d7ff (diff)
parentdaac678859e63444a1351f7eac8b471615478b48 (diff)
downloadloganalysis-6f9812173359fe40cc3a82c67fb78ac567d81c26.tar.gz
Merge "Parse additional boot information from dmesg logs"
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/loganalysis/parser/DmesgParser.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/loganalysis/parser/DmesgParser.java b/src/com/android/loganalysis/parser/DmesgParser.java
index ba802cf..bd0d8e4 100644
--- a/src/com/android/loganalysis/parser/DmesgParser.java
+++ b/src/com/android/loganalysis/parser/DmesgParser.java
@@ -20,7 +20,6 @@ import com.android.loganalysis.item.DmesgActionInfoItem;
import com.android.loganalysis.item.DmesgItem;
import com.android.loganalysis.item.DmesgServiceInfoItem;
import com.android.loganalysis.item.DmesgStageInfoItem;
-
import com.google.common.annotations.VisibleForTesting;
import java.io.BufferedReader;
@@ -65,12 +64,10 @@ public class DmesgParser implements IParser {
String.format("%s%s", SERVICE_PREFIX, START_STAGE_PREFIX));
// Matches: init: processing action (early-init)
- // must not match: init: processing action (vold.decrypt=trigger_restart_framework)
private static final String START_PROCESSING_ACTION_PREFIX = String.format(
- "processing action \\((?<%s>[^=]+)\\)", ACTION);
+ "processing action \\((?<%s>.*)\\)", ACTION);
// Matches: [ 14.942872] init: processing action (early-init)
- // Does not match: [ 22.361049] init: processing action (persist.sys.usb.config=* boot)
private static final Pattern START_PROCESSING_ACTION = Pattern.compile(
String.format("%s%s", SERVICE_PREFIX, START_PROCESSING_ACTION_PREFIX));