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

Commit e11e386c 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
am: 18f63bee

Change-Id: Iaefb0543a69db421ac6fb895f651fd8125dd0c84
parents 169bf673 18f63bee

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

+6 −1
Original line number Diff line number Diff line
@@ -13885,8 +13885,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;