diff options
| author | Jake Hamby <jhamby@google.com> | 2011-11-17 13:53:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 13:53:17 -0800 |
| commit | 0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1 (patch) | |
| tree | 03a41d9551135728fd9f415b7b44194737d13e29 | |
| parent | 2b9af44e401d884469869a4ac0933bfa727d3135 (diff) | |
| parent | 9c27e36eca46e5bf543678775ffa4ed1ee565faf (diff) | |
| download | frameworks_base-0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1.zip frameworks_base-0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1.tar.gz frameworks_base-0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1.tar.bz2 | |
Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
| -rw-r--r-- | cmds/dumpstate/dumpstate.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index ca66a4e..fe81d2b 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -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(); |