Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7509733c: Elide extras strings from noman dumpsys output.

Browse Source 
* commit '7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
  Elide extras strings from noman dumpsys output.
This commit is contained in:
Dan Sandler
2014-05-21 16:26:29 +00:00
committed by Android Git Automerger
parent fce708d285 7509733c8d
commit d0ec843882
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -814,19 +814,18 @@ public class NotificationManagerService extends SystemService {
if (val == null) { if (val == null) {
pw.println("null"); pw.println("null");
} else { } else {
pw.print(val.toString()); pw.print(val.getClass().getSimpleName());
if (val instanceof Bitmap) { if (val instanceof CharSequence || val instanceof String) {
// redact contents from bugreports
} else if (val instanceof Bitmap) {
pw.print(String.format(" (%dx%d)", pw.print(String.format(" (%dx%d)",
((Bitmap) val).getWidth(), ((Bitmap) val).getWidth(),
((Bitmap) val).getHeight())); ((Bitmap) val).getHeight()));
} else if (val.getClass().isArray()) { } else if (val.getClass().isArray()) {
pw.println(" {");
final int N = Array.getLength(val); final int N = Array.getLength(val);
for (int i=0; i<N; i++) { pw.println(" (" + N + ")");
if (i > 0) pw.println(","); } else {
pw.print(prefix + " " + Array.get(val, i)); pw.print(" (" + String.valueOf(val) + ")");
}
pw.print("\n" + prefix + " }");
} }
pw.println(); pw.println();
} }