am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

* commit '0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
  Re-enable vril-dump for adb bugreport.
This commit is contained in:
Jake Hamby
2011-11-17 16:03:26 -08:00
committed by Android Git Automerger

View File

@@ -145,8 +145,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)) {
@@ -160,7 +159,6 @@ static void dumpstate() {
"su", "root", "vril-dump", NULL);
}
}
#endif
print_properties();