Merge \"Fix issue #29252997: Should be able to dump only broadcast stats as checkin format\" into nyc-dev

am: 9303ecb317 Change-Id: Ibbb8301975226ada197b2bf07970108a2faac005
2016-06-10 17:49:59 +00:00
parent 3287c5f380 9303ecb317
commit df2485cf48
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13881,7 +13881,12 @@ public final class ActivityManagerService extends ActivityManagerNative
                            args.length - opti);
                }
                synchronized (this) {
-                    dumpBroadcastStatsLocked(fd, pw, args, opti, true, dumpPackage);
+                    if (dumpCheckinFormat) {
+                        dumpBroadcastStatsCheckinLocked(fd, pw, args, opti, dumpCheckin,
+                                dumpPackage);
+                    } else {
+                        dumpBroadcastStatsLocked(fd, pw, args, opti, true, dumpPackage);
+                    }
                }
            } else if ("intents".equals(cmd) || "i".equals(cmd)) {
                String[] newArgs;