diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-11-04 20:06:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-04 20:06:42 -0700 |
| commit | 343c59cc8d67a6be6b6a1a8dfc4376855589ea9a (patch) | |
| tree | 2efb6b50507926604135f863eb20c6d8090b5a54 /libs/utils | |
| parent | 71d2a8746614460918d0d5e5a6e571c90b3c80fa (diff) | |
| parent | 2ab79e755ba0c4d4f0a6b8a969baa630ce71f81e (diff) | |
| download | frameworks_native-343c59cc8d67a6be6b6a1a8dfc4376855589ea9a.zip frameworks_native-343c59cc8d67a6be6b6a1a8dfc4376855589ea9a.tar.gz frameworks_native-343c59cc8d67a6be6b6a1a8dfc4376855589ea9a.tar.bz2 | |
Merge "Slight change to the unwinder API."
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/CallStack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/utils/CallStack.cpp b/libs/utils/CallStack.cpp index d79a757..b4c581b 100644 --- a/libs/utils/CallStack.cpp +++ b/libs/utils/CallStack.cpp @@ -103,7 +103,7 @@ void CallStack::dump(const char* prefix) const { for (size_t i = 0; i < mCount; i++) { const backtrace_frame_t& frame = mStack[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; if (symbolName) { 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++) { const backtrace_frame_t& frame = mStack[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; if (symbolName) { str.appendFormat("%s#%02d pc %08x %s (%s)\n", prefix, |