diff options
| author | Jake Hamby <jhamby@google.com> | 2011-11-17 16:03:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 16:03:26 -0800 |
| commit | bd91e23cdec00907c2f9640a41cf4ba6cd75ca01 (patch) | |
| tree | 23fd7fd4037f3aa1309b6e140303ddc9e4ccfcbf | |
| parent | 430d36fef9decb78f039a9713207548225244d17 (diff) | |
| parent | 0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1 (diff) | |
| download | frameworks_base-bd91e23cdec00907c2f9640a41cf4ba6cd75ca01.zip frameworks_base-bd91e23cdec00907c2f9640a41cf4ba6cd75ca01.tar.gz frameworks_base-bd91e23cdec00907c2f9640a41cf4ba6cd75ca01.tar.bz2 | |
am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1
* commit '0f3570c3c1467bc4c900d256c6d9dc12ffb35ff1':
Re-enable vril-dump for adb bugreport.
| -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(); |