summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-02-24 16:57:19 -0800
committerMark Salyzyn <salyzyn@google.com>2015-02-26 10:05:40 -0800
commit59b0b568d0ce20394e6d491342ad0b06682dfa45 (patch)
tree9d78c69fc96f6777392ac795e6c49c79ac4f93ac /cmds
parent53ec1f0d18a66f7d1e6c5404c14502de09b60b08 (diff)
parentd6c8ae9c15fc335f2be0a567edd1c3d5247b0187 (diff)
downloadframeworks_native-59b0b568d0ce20394e6d491342ad0b06682dfa45.zip
frameworks_native-59b0b568d0ce20394e6d491342ad0b06682dfa45.tar.gz
frameworks_native-59b0b568d0ce20394e6d491342ad0b06682dfa45.tar.bz2
resolved conflicts for merge of d6c8ae9c to master
Change-Id: I3cbb6ed0958b4328aca1798c7fe6080c31555a3a
Diffstat (limited to 'cmds')
-rw-r--r--cmds/dumpstate/dumpstate.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 654882f..96ffca5 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -239,6 +239,10 @@ static void dumpstate() {
dump_file("LAST PANIC CONSOLE", "/data/dontpanic/apanic_console");
dump_file("LAST PANIC THREADS", "/data/dontpanic/apanic_threads");
+ /* kernels must set CONFIG_PSTORE_PMSG, slice up pstore with device tree */
+ run_command("LAST LOGCAT", 10, "logcat", "-L", "-v", "threadtime",
+ "-b", "all", "-d", "*:v", NULL);
+
/* The following have a tendency to get wedged when wifi drivers/fw goes belly-up. */
run_command("NETWORK INTERFACES", 10, "ip", "link", NULL);