Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

Jake Hamby · Android (Google) Code Review · commit 0f3570c3c146 · 2011-11-17T13:53:17.000-08:00
diff --git 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();
 

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,7 @@ static void dumpstate() {`
`145`	`145`	`"su", "root", "wlutil", "counters", NULL);`
`146`	`146`	`#endif`
`147`	`147`
`148`		`-#ifdef BROKEN_VRIL_IS_FIXED_B_4442803`
`149`		`- char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};`
	`148`	`+ char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};`
`150`	`149`	`property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30");`
`151`	`150`	`if (strnlen(ril_dumpstate_timeout, PROPERTY_VALUE_MAX - 1) > 0) {`
`152`	`151`	`if (0 == strncmp(build_type, "user", PROPERTY_VALUE_MAX - 1)) {`
`@@ -160,7 +159,6 @@ static void dumpstate() {`
`160`	`159`	`"su", "root", "vril-dump", NULL);`
`161`	`160`	`}`
`162`	`161`	`}`
`163`		`-#endif`
`164`	`162`
`165`	`163`	`print_properties();`
`166`	`164`