diff options
| author | 2014-12-11 01:58:50 +0000 | |
|---|---|---|
| committer | 2014-12-11 01:58:51 +0000 | |
| commit | 84adc43a70302278eea4d9c198e14c88d6432f9c (patch) | |
| tree | 4bd6f88f4be0d9e41281d7e927f9dee9b5e8f999 | |
| parent | eb2dcc791e649e07ec8114e00752b54965c46e65 (diff) | |
| parent | 1353df5655a551cbbf403d4f1f88b72761fe9e6b (diff) | |
Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev
| -rw-r--r-- | core/java/android/os/Debug.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index a9deaf354b7e..b8178b462b14 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -296,7 +296,7 @@ public final class Debug case 1: return "Stack"; case 2: return "Cursor"; case 3: return "Ashmem"; - case 4: return "Gfx driver"; + case 4: return "Gfx dev"; case 5: return "Other dev"; case 6: return ".so mmap"; case 7: return ".jar mmap"; @@ -306,9 +306,9 @@ public final class Debug case 11: return ".oat mmap"; case 12: return ".art mmap"; case 13: return "Other mmap"; - case 14: return "Graphics"; - case 15: return "GL"; - case 16: return "Memtrack"; + case 14: return "EGL mtrack"; + case 15: return "GL mtrack"; + case 16: return "Other mtrack"; case 17: return ".Heap"; case 18: return ".LOS"; case 19: return ".LinearAlloc"; |