summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2016-01-26 21:55:15 +0000
committer android-build-merger <android-build-merger@google.com> 2016-01-26 21:55:15 +0000
commit876de450004b02b9c028ece0d3ca850504caaa4d (patch)
tree339404278404bbd115230659cd1de4eaaced697c
parent1b2ef80e939fbe68bb049b09c5fff6dabfdb64dc (diff)
parentfd0d76730f06bec15c90e9a9da64ee19361c3a9f (diff)
Merge "Revert "dumpstate: Add security log dump"" am: 316923d359
am: fd0d76730f * commit 'fd0d76730f06bec15c90e9a9da64ee19361c3a9f': Revert "dumpstate: Add security log dump"
-rw-r--r--cmds/dumpstate/dumpstate.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index e809bac329..933f7fae85 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -466,12 +466,11 @@ static void dumpstate(const std::string& screenshot_path) {
"-v", "printable",
"-d",
"*:v", NULL);
- timeout = logcat_timeout("events") + logcat_timeout("security");
+ timeout = logcat_timeout("events");
if (timeout < 20000) {
timeout = 20000;
}
run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events",
- "-b", "security",
"-v", "threadtime",
"-v", "printable",
"-d",