summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wink Saville <wink@google.com> 2011-05-17 23:32:01 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-05-17 23:32:01 -0700
commit748caa8a7e97f8ba995bde28e3ac5956467b7267 (patch)
tree8e9d39faaaf8bcee069f136eb70c281efb9ec39b
parentf84e4a657f2f8b5af085bb9694f1fca837d7cd1f (diff)
parentcb4d1a91fc09fed1281781c4507e1e69afb476e5 (diff)
Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"
-rw-r--r--cmds/dumpstate/dumpstate.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index b0d764f9e71f..21bb62eeeced 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -133,12 +133,14 @@ static void dumpstate() {
"su", "root", "wlutil", "counters", NULL);
#endif
- char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};
+#ifdef BROKEN_VRIL_IS_FIXED_B_4442803
+ char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};
property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30");
if (strlen(ril_dumpstate_timeout) > 0) {
run_command("DUMP VENDOR RIL LOGS", atoi(ril_dumpstate_timeout),
"su", "root", "vril-dump", NULL);
}
+#endif
print_properties();