diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-10-19 23:17:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-19 23:17:09 +0000 |
| commit | df0cc41a7bfa480ce5584420bceda850ad0c56c8 (patch) | |
| tree | fc7a6861f7c293930d4c8956e2fd5676238c676a /core/jni | |
| parent | aebff7f1ad23299d1ed71e83a3e76619a1a03574 (diff) | |
| parent | 7f2deeeef53887dcad74b8aed86936983353cec4 (diff) | |
| download | frameworks_base-df0cc41a7bfa480ce5584420bceda850ad0c56c8.zip frameworks_base-df0cc41a7bfa480ce5584420bceda850ad0c56c8.tar.gz frameworks_base-df0cc41a7bfa480ce5584420bceda850ad0c56c8.tar.bz2 | |
Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev
am: 7f2deeeef5
* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
Fix read_mapinfo to recognize free list large object space
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index e8acd97..9b8243d 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -309,7 +309,9 @@ static void read_mapinfo(FILE *fp, stats_t* stats) // This is the regular Dalvik heap. whichHeap = HEAP_DALVIK; subHeap = HEAP_DALVIK_NORMAL; - } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name) { + } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name || + strstr(name, "/dev/ashmem/dalvik-free list large object space") + == name) { whichHeap = HEAP_DALVIK; subHeap = HEAP_DALVIK_LARGE; } else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) { |