am df1bc670: resolved conflicts for merge of d213f5e7 to cw-e-dev

* commit 'df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8':
  dumpstate: add logcat -b all -S
This commit is contained in:
Mark Salyzyn 2015-08-11 23:44:46 +00:00 committed by Android Git Automerger
commit d939c96712

View File

@ -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 */