summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-10-29 15:25:44 -0700
committerBrad Fitzpatrick <bradfitz@android.com>2010-10-29 15:25:44 -0700
commitbfb191998eba2ebc710ff9eb59480b10909ba4c9 (patch)
tree384363801caa914f4035485392a204e6fe83ea0e /services
parent06487a58be22b100daf3f950b9a1d25c3ea42aa2 (diff)
downloadframeworks_base-bfb191998eba2ebc710ff9eb59480b10909ba4c9.zip
frameworks_base-bfb191998eba2ebc710ff9eb59480b10909ba4c9.tar.gz
frameworks_base-bfb191998eba2ebc710ff9eb59480b10909ba4c9.tar.bz2
StrictMode: annotate violations with the Broadcast Intent's action, if any.
Change-Id: If36ab776bb95054a109b5475c6be041c75c7e0af
Diffstat (limited to 'services')
-rw-r--r--services/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 8d36e4f..60b2b67 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6679,6 +6679,9 @@ public final class ActivityManagerService extends ActivityManagerNative
if (info.numAnimationsRunning != 0) {
sb.append("Animations-Running: ").append(info.numAnimationsRunning).append("\n");
}
+ if (info.broadcastIntentAction != null) {
+ sb.append("Broadcast-Intent-Action: ").append(info.broadcastIntentAction).append("\n");
+ }
if (info != null && info.durationMillis != -1) {
sb.append("Duration-Millis: ").append(info.durationMillis).append("\n");
}