summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-08-11 16:27:05 -0700
committerMark Salyzyn <salyzyn@google.com>2015-08-11 16:27:05 -0700
commitdf1bc67019f4eda8acfd4b97d4c4fd98b55edcb8 (patch)
tree07a7b52a5a1c07c07c624e91d1b8e7bd0f992667
parent18108fd6837fffff1b7c1db418d44bc7644911f1 (diff)
parentd213f5e7a4bee477c707fc428cb24aa503971ef1 (diff)
downloadframeworks_native-df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8.zip
frameworks_native-df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8.tar.gz
frameworks_native-df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8.tar.bz2
resolved conflicts for merge of d213f5e7 to cw-e-dev
Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829
-rw-r--r--cmds/dumpstate/dumpstate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 58e2dc6..0aa8fe9 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -349,6 +349,8 @@ static void dumpstate() {
}
run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);
+ run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);
+
run_command("RAFT LOGS", 300, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);
/* show the traces we collected in main(), if that was done */