summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAnwar Ghuloum <anwarg@google.com>2013-05-23 22:13:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-23 22:13:28 +0000
commit9a78222df21931018ad950565ab56cbf455c29a3 (patch)
treedd271f427dafebbe9326eed89c6a275dfc923797 /core/java/android
parent17082e0452d885428b787ce1e1edcebdd79afc97 (diff)
parent88887d0a53f866e61a7524b0edfc95e6dde57d72 (diff)
downloadframeworks_base-9a78222df21931018ad950565ab56cbf455c29a3.zip
frameworks_base-9a78222df21931018ad950565ab56cbf455c29a3.tar.gz
frameworks_base-9a78222df21931018ad950565ab56cbf455c29a3.tar.bz2
Merge "break out boot.art"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/Debug.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index 1557644..353694d 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -130,7 +130,7 @@ public final class Debug
public int otherSharedDirty;
/** @hide */
- public static final int NUM_OTHER_STATS = 11;
+ public static final int NUM_OTHER_STATS = 12;
private int[] otherStats = new int[NUM_OTHER_STATS*3];
@@ -187,7 +187,8 @@ public final class Debug
case 7: return ".ttf mmap";
case 8: return ".dex mmap";
case 9: return ".oat mmap";
- case 10: return "Other mmap";
+ case 10: return ".art mmap";
+ case 11: return "Other mmap";
default: return "????";
}
}