summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-11-10 18:08:36 -0800
committerBrad Fitzpatrick <bradfitz@android.com>2010-11-11 09:46:07 -0800
commite7520d89fe2c5dc9dd833ecd9769c981df855b61 (patch)
treec9a1386319be29f059bdda598252e9f7f96ee000 /services
parent8bda1c1ef76618ec3e4bd7bb9db44dd325edc629 (diff)
downloadframeworks_base-e7520d89fe2c5dc9dd833ecd9769c981df855b61.zip
frameworks_base-e7520d89fe2c5dc9dd833ecd9769c981df855b61.tar.gz
frameworks_base-e7520d89fe2c5dc9dd833ecd9769c981df855b61.tar.bz2
StrictMode.Span support
Support for annotating critical regions (e.g. animations) with a tag to be uploaded. Change-Id: I412fc78f40dc05c9a3c9f62a4b0463201dbdb767
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index ba8d7d2..1ec8a22 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6702,9 +6702,14 @@ public final class ActivityManagerService extends ActivityManagerNative
if (info.broadcastIntentAction != null) {
sb.append("Broadcast-Intent-Action: ").append(info.broadcastIntentAction).append("\n");
}
- if (info != null && info.durationMillis != -1) {
+ if (info.durationMillis != -1) {
sb.append("Duration-Millis: ").append(info.durationMillis).append("\n");
}
+ if (info.tags != null) {
+ for (String tag : info.tags) {
+ sb.append("Span-Tag: ").append(tag).append("\n");
+ }
+ }
sb.append("\n");
if (info.crashInfo != null && info.crashInfo.stackTrace != null) {
sb.append(info.crashInfo.stackTrace);