diff options
| author | Ian Rogers <irogers@google.com> | 2013-02-22 18:02:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-02-22 18:02:40 +0000 |
| commit | 08a92a335fd84ca427b55c6c2d39f72970d82b76 (patch) | |
| tree | 4424b624778bfaab41d73486ec088fa048bcdaf0 | |
| parent | 49999acb049e09f99135e412cbb10d7367d2d607 (diff) | |
| parent | afc10e174d73363185f42cb67ec429a64549f2c7 (diff) | |
| download | frameworks_base-08a92a335fd84ca427b55c6c2d39f72970d82b76.zip frameworks_base-08a92a335fd84ca427b55c6c2d39f72970d82b76.tar.gz frameworks_base-08a92a335fd84ca427b55c6c2d39f72970d82b76.tar.bz2 | |
Merge "Account malloc mmaped pages as native heap."
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 6724f36..56b687c 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -159,7 +159,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats) name = line + name_pos; nameLen = strlen(name); - if (strstr(name, "[heap]") == name) { + if ((strstr(name, "[heap]") == name) || + (strstr(name, "/dev/ashmem/libc malloc") == name)) { whichHeap = HEAP_NATIVE; } else if (strstr(name, "/dev/ashmem/dalvik-") == name) { whichHeap = HEAP_DALVIK; |