commit fd0d76730f06bec15c90e9a9da64ee19361c3a9f
author Mark Salyzyn <salyzyn@google.com> Tue Jan 26 20:48:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 26 20:48:08 2016 +0000
tree 340b1769cb4333be1b6cc252448e611e9deb9a2c
parent b4f7fea19c3bcf4e9738c632cc83104ed7c44467
parent 316923d3597af72d1cbd9eb2745a02706275fdb8

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

* commit '316923d3597af72d1cbd9eb2745a02706275fdb8':
  Revert "dumpstate: Add security log dump"

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 08c6aa7..c114b59 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -340,12 +340,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",