Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"

2011-05-17 23:32:01 -07:00
parent f84e4a657f cb4d1a91fc
commit 748caa8a7e
1 changed files with 3 additions and 1 deletions
--- 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();