commit 876de450004b02b9c028ece0d3ca850504caaa4d
author Mark Salyzyn <salyzyn@google.com> Tue Jan 26 21:55:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 26 21:55:15 2016 +0000
tree 339404278404bbd115230659cd1de4eaaced697c
parent 1b2ef80e939fbe68bb049b09c5fff6dabfdb64dc
parent fd0d76730f06bec15c90e9a9da64ee19361c3a9f

Merge "Revert "dumpstate: Add security log dump"" am: 316923d359
am: fd0d76730f

* commit 'fd0d76730f06bec15c90e9a9da64ee19361c3a9f':
  Revert "dumpstate: Add security log dump"

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index e809bac..933f7fa 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -466,12 +466,11 @@
                                                         "-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",