summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jake Hamby <jhamby@google.com> 2011-11-17 15:56:25 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-17 15:56:25 -0800
commita4d76b81a57577d7dded9ff58d97c4fcbe09e78e (patch)
tree4b2af0a1e6a075ba048cb1835e4ccc1a18424b1a
parent8549aeea0af63810bd5a661a23079d6554e4717b (diff)
parent2084d20668a79e5a31ec7365652434ec943503ef (diff)
am 2084d206: am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '2084d20668a79e5a31ec7365652434ec943503ef': Re-enable vril-dump for adb bugreport.
-rw-r--r--cmds/dumpstate/dumpstate.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 1e746cd5c691..52465a0ce114 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -146,8 +146,7 @@ static void dumpstate() {
"su", "root", "wlutil", "counters", NULL);
#endif
-#ifdef BROKEN_VRIL_IS_FIXED_B_4442803
- char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};
+ char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};
property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30");
if (strnlen(ril_dumpstate_timeout, PROPERTY_VALUE_MAX - 1) > 0) {
if (0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1)) {
@@ -161,7 +160,6 @@ static void dumpstate() {
"su", "root", "vril-dump", NULL);
}
}
-#endif
print_properties();