diff options
| author | 2017-12-19 17:46:06 +0000 | |
|---|---|---|
| committer | 2017-12-19 17:46:06 +0000 | |
| commit | e51ffaa6aca7d8413bc51e9d472ca664d23869e5 (patch) | |
| tree | bb7c58607e7a171d7f103f0f5c65c8e299e01690 | |
| parent | a400718ab5a75b698dfbb947b1373520335a89c2 (diff) | |
| parent | 838ea24493ea5fff38b08ac5219587ea035b48e1 (diff) | |
Merge "Fix usagestats DUMP OF SERVICE"
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 2 | ||||
| -rw-r--r-- | services/usage/java/com/android/server/usage/UsageStatsService.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 267f99761a89..19e3a23dae2c 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -3850,7 +3850,7 @@ public class ActivityManager { pw.println(); dumpService(pw, fd, ProcessStats.SERVICE_NAME, new String[] { packageName }); pw.println(); - dumpService(pw, fd, "usagestats", new String[] { "--packages", packageName }); + dumpService(pw, fd, "usagestats", new String[] { packageName }); pw.println(); dumpService(pw, fd, BatteryStats.SERVICE_NAME, new String[] { packageName }); pw.flush(); diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 07c860b54413..cdce44872cc0 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -495,8 +495,8 @@ public class UsageStatsService extends SystemService implements flushToDiskLocked(); pw.println("Flushed stats to disk"); return; - } else { - // Anything else is a pkg to filter + } else if (arg != null && !arg.startsWith("-")) { + // Anything else that doesn't start with '-' is a pkg to filter pkg = arg; break; } |