am a6c1ab52: Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev (93628db3) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -101,6 +101,12 @@ static void dumpstate() {

	run_command("LIST OF OPEN FILES", 10, SU_PATH, "root", "lsof", NULL);		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_pid(do_showmap, "SMAPS OF ALL PROCESSES");
	for_each_tid(show_wchan, "BLOCKED PROCESS WAIT-CHANNELS");		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 CONSOLE", "/data/dontpanic/apanic_console");
	dump_file("LAST PANIC THREADS", "/data/dontpanic/apanic_threads");		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",		run_command("SYSTEM SETTINGS", 20, SU_PATH, "root", "sqlite3",
	"/data/data/com.android.providers.settings/databases/settings.db",		"/data/data/com.android.providers.settings/databases/settings.db",
	"pragma user_version; select * from system; select * from secure; select * from global;", NULL);		"pragma user_version; select * from system; select * from secure; select * from global;", NULL);