summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-01-19 14:53:24 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-19 14:53:24 -0800
commit9240f16d771549b62b5f10efe9f784d87a0afaa4 (patch)
tree8e1357665f0d0cfd00e7c05be16418ed5abf69d6 /services
parentb098f73556ae31f505782d2fe7028b83d1564147 (diff)
parentbfbe5771106a07f9c8e8685e402b1003db40526f (diff)
downloadframeworks_base-9240f16d771549b62b5f10efe9f784d87a0afaa4.zip
frameworks_base-9240f16d771549b62b5f10efe9f784d87a0afaa4.tar.gz
frameworks_base-9240f16d771549b62b5f10efe9f784d87a0afaa4.tar.bz2
Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb
Diffstat (limited to 'services')
-rwxr-xr-xservices/java/com/android/server/am/ActivityManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 2ef85d5..9e9a4f2 100755
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6817,6 +6817,9 @@ public final class ActivityManagerService extends ActivityManagerNative
if (info.durationMillis != -1) {
sb.append("Duration-Millis: ").append(info.durationMillis).append("\n");
}
+ if (info.numInstances != -1) {
+ sb.append("Instance-Count: ").append(info.numInstances).append("\n");
+ }
if (info.tags != null) {
for (String tag : info.tags) {
sb.append("Span-Tag: ").append(tag).append("\n");