summaryrefslogtreecommitdiffstats
path: root/services/core/java
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2014-05-15 22:22:10 -0400
committerDan Sandler <dsandler@android.com>2014-05-21 13:36:41 +0000
commitb979f23c5970138d75d5c2e76ded1470f7a8eb83 (patch)
treea4f7f3296ef3454a0d903edb1753db46a1ff3355 /services/core/java
parent5daa4598e2cc764f89b4138d2ac15ce3f8f4f56f (diff)
downloadframeworks_base-b979f23c5970138d75d5c2e76ded1470f7a8eb83.zip
frameworks_base-b979f23c5970138d75d5c2e76ded1470f7a8eb83.tar.gz
frameworks_base-b979f23c5970138d75d5c2e76ded1470f7a8eb83.tar.bz2
Elide extras strings from noman dumpsys output.
Bug: 14292528 Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
Diffstat (limited to 'services/core/java')
-rw-r--r--services/core/java/com/android/server/notification/NotificationManagerService.java15
1 files changed, 7 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 10935ad..2945418 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -513,19 +513,18 @@ public class NotificationManagerService extends SystemService {
if (val == null) {
pw.println("null");
} else {
- pw.print(val.toString());
- if (val instanceof Bitmap) {
+ pw.print(val.getClass().getSimpleName());
+ if (val instanceof CharSequence || val instanceof String) {
+ // redact contents from bugreports
+ } else if (val instanceof Bitmap) {
pw.print(String.format(" (%dx%d)",
((Bitmap) val).getWidth(),
((Bitmap) val).getHeight()));
} else if (val.getClass().isArray()) {
- pw.println(" {");
final int N = Array.getLength(val);
- for (int i=0; i<N; i++) {
- if (i > 0) pw.println(",");
- pw.print(prefix + " " + Array.get(val, i));
- }
- pw.print("\n" + prefix + " }");
+ pw.println(" (" + N + ")");
+ } else {
+ pw.print(" (" + String.valueOf(val) + ")");
}
pw.println();
}