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

am 05222c34: am 829920ed: am 34c120dc: Merge ""Fix" issue #24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev

Browse Source 
* commit '05222c3440d1ba207fe6f87037a8297f33f3318a':
  "Fix" issue #24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
This commit is contained in:
Dianne Hackborn
2015-10-13 00:20:42 +00:00
committed by Android Git Automerger
parent ae9ae6c598 05222c3440
commit a7036ce15a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/Debug.java
View File

@@ -471,7 +471,7 @@ public final class Debug
* </tbody>
* </table>
*/
public String getMemoryStat(String statName) {
public String getMemoryStat(String statName) {
switch(statName) {
case "summary.java-heap":
return Integer.toString(getSummaryJavaHeap());
@@ -1538,7 +1538,13 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo
/**
* Retrieves information about this processes memory usages. This information is broken down by
* how much is in use by dalivk, the native heap, and everything else.
* how much is in use by dalvik, the native heap, and everything else.
*
* <p><b>Note:</b> this method directly retrieves memory information for the give process
* from low-level data available to it. It may not be able to retrieve information about
* some protected allocations, such as graphics. If you want to be sure you can see
* all information about allocations by the process, use instead
* {@link android.app.ActivityManager#getProcessMemoryInfo(int[])}.</p>
*/
public static native void getMemoryInfo(MemoryInfo memoryInfo);