Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e88c0d9e: Merge "Recognize odex files in memory accounting."

Browse Source 
* commit 'e88c0d9ec374ec4dcca6ccd8d440610ea83622c9':
  Recognize odex files in memory accounting.
This commit is contained in:
Ian Rogers
2013-02-25 10:04:53 -08:00
committed by Android Git Automerger
parent 06689433bc e88c0d9ec3
commit 92f3e9a1fb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_os_Debug.cpp
View File

@@ -178,7 +178,8 @@ static void read_mapinfo(FILE *fp, stats_t* stats)
whichHeap = HEAP_APK;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".ttf") == 0) {
whichHeap = HEAP_TTF;
} else if (nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) {
} else if ((nameLen > 4 && strcmp(name+nameLen-4, ".dex") == 0) ||
(nameLen > 5 && strcmp(name+nameLen-5, ".odex") == 0)) {
whichHeap = HEAP_DEX;
} else if (nameLen > 0) {
whichHeap = HEAP_UNKNOWN_MAP;