Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2084d206 authored by Jake Hamby's avatar Jake Hamby Committed by Android Git Automerger
Browse files

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

* commit '0f3570c3':
  Re-enable vril-dump for adb bugreport.
parents a4f5c425 0f3570c3

cmds/dumpstate/dumpstate.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -145,7 +145,6 @@ static void dumpstate() { 
            "su", "root", "wlutil", "counters", NULL);

            "su", "root", "wlutil", "counters", NULL);

#endif

#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");

    property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30");

    if (strnlen(ril_dumpstate_timeout, PROPERTY_VALUE_MAX - 1) > 0) {

    if (strnlen(ril_dumpstate_timeout, PROPERTY_VALUE_MAX - 1) > 0) {
@@ -160,7 +159,6 @@ static void dumpstate() { 
                    "su", "root", "vril-dump", NULL);

                    "su", "root", "vril-dump", NULL);

        }

        }

    }

    }

#endif





    print_properties();

    print_properties();