am 7006cdfc: am 0c2a25c1: Merge "Include Global table in bugreports." into jb-mr1-dev

* commit '7006cdfc72bbb58d9460189a691b6b0fe615524b':
  Include Global table in bugreports.
This commit is contained in:
Jeff Sharkey 2012-10-01 13:48:42 -07:00 committed by Android Git Automerger
commit 302a733a8b

View File

@ -166,7 +166,7 @@ static void dumpstate() {
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;", NULL); "pragma user_version; select * from system; select * from secure; select * from global;", NULL);
/* The following have a tendency to get wedged when wifi drivers/fw goes belly-up. */ /* The following have a tendency to get wedged when wifi drivers/fw goes belly-up. */
run_command("NETWORK INTERFACES", 10, SU_PATH, "root", "netcfg", NULL); run_command("NETWORK INTERFACES", 10, SU_PATH, "root", "netcfg", NULL);