From 5a93003d3f0d1808b6dcd9928041ec62ea7f67ad Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 19 Mar 2013 15:05:19 -0700 Subject: [PATCH] Move screenshots near beginning of dumpstate. Bug: 8420215 Change-Id: I6adffd1182ed8f99b8d11d43785a4eb4a388ceb5 --- cmds/dumpstate/dumpstate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index b3a4cc66a..a18c00d1c 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -101,6 +101,12 @@ static void dumpstate() { run_command("LIST OF OPEN FILES", 10, SU_PATH, "root", "lsof", NULL); + if (screenshot_path[0]) { + ALOGI("taking screenshot\n"); + run_command(NULL, 10, "/system/bin/screencap", "-p", screenshot_path, NULL); + ALOGI("wrote screenshot: %s\n", screenshot_path); + } + for_each_pid(do_showmap, "SMAPS OF ALL PROCESSES"); for_each_tid(show_wchan, "BLOCKED PROCESS WAIT-CHANNELS"); @@ -159,12 +165,6 @@ static void dumpstate() { dump_file("LAST PANIC CONSOLE", "/data/dontpanic/apanic_console"); dump_file("LAST PANIC THREADS", "/data/dontpanic/apanic_threads"); - if (screenshot_path[0]) { - ALOGI("taking screenshot\n"); - run_command(NULL, 10, "/system/bin/screencap", "-p", screenshot_path, NULL); - ALOGI("wrote screenshot: %s\n", screenshot_path); - } - run_command("SYSTEM SETTINGS", 20, SU_PATH, "root", "sqlite3", "/data/data/com.android.providers.settings/databases/settings.db", "pragma user_version; select * from system; select * from secure; select * from global;", NULL);