summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-12-09 01:24:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-09 01:24:52 +0000
commit52070f81f2c4c41ffe74adcabda64c2b0349c62d (patch)
tree5f8bd3d7adb621151fcbeb5042f18587237ab753 /core/java/android
parent0f78ad87f09b2230fc9e472a6cb412c560bdbd4f (diff)
parent25c5e2b12d5d5d06739e3f70a0da968d97935b46 (diff)
downloadframeworks_base-52070f81f2c4c41ffe74adcabda64c2b0349c62d.zip
frameworks_base-52070f81f2c4c41ffe74adcabda64c2b0349c62d.tar.gz
frameworks_base-52070f81f2c4c41ffe74adcabda64c2b0349c62d.tar.bz2
Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/Debug.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 3f42d25..7eb606a 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -168,7 +168,7 @@ public final class Debug
public static final int NUM_OTHER_STATS = 17;
/** @hide */
- public static final int NUM_DVK_STATS = 5;
+ public static final int NUM_DVK_STATS = 8;
/** @hide */
public static final int NUM_CATEGORIES = 7;
@@ -314,6 +314,9 @@ public final class Debug
case 19: return ".LinearAlloc";
case 20: return ".GC";
case 21: return ".JITCache";
+ case 22: return ".Zygote";
+ case 23: return ".NonMoving";
+ case 24: return ".IndirectRef";
default: return "????";
}
}