Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18f63bee authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

Merge \\"Fix issue #29252997: Should be able to dump only broadcast stats as... 

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

Change-Id: Id44bf78312e173b84dc4abe65a099e81d00812f4
parents a070ea19 df2485cf

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -13881,8 +13881,13 @@ public final class ActivityManagerService extends ActivityManagerNative 
                            args.length - opti);

                }

                synchronized (this) {

                    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;

                String name;