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

Commit 343c59cc authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Slight change to the unwinder API."

parents 71d2a874 2ab79e75

libs/utils/CallStack.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ void CallStack::dump(const char* prefix) const { 
    for (size_t i = 0; i < mCount; i++) {

    for (size_t i = 0; i < mCount; i++) {

        const backtrace_frame_t& frame = mStack[i];

        const backtrace_frame_t& frame = mStack[i];

        const backtrace_symbol_t& symbol = symbols[i];

        const backtrace_symbol_t& symbol = symbols[i];

        const char* mapName = symbol.map_info ? symbol.map_info->name : "<unknown>";

        const char* mapName = symbol.map_name ? symbol.map_name : "<unknown>";

        const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;

        const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;

        if (symbolName) {

        if (symbolName) {

            LOGD("%s#%02d  pc %08x  %s (%s)\n", prefix,

            LOGD("%s#%02d  pc %08x  %s (%s)\n", prefix,
@@ -124,7 +124,7 @@ String8 CallStack::toString(const char* prefix) const { 
    for (size_t i = 0; i < mCount; i++) {

    for (size_t i = 0; i < mCount; i++) {

        const backtrace_frame_t& frame = mStack[i];

        const backtrace_frame_t& frame = mStack[i];

        const backtrace_symbol_t& symbol = symbols[i];

        const backtrace_symbol_t& symbol = symbols[i];

        const char* mapName = symbol.map_info ? symbol.map_info->name : "<unknown>";

        const char* mapName = symbol.map_name ? symbol.map_name : "<unknown>";

        const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;

        const char* symbolName = symbol.demangled_name ? symbol.demangled_name : symbol.name;

        if (symbolName) {

        if (symbolName) {

            str.appendFormat("%s#%02d  pc %08x  %s (%s)\n", prefix,

            str.appendFormat("%s#%02d  pc %08x  %s (%s)\n", prefix,