From 838ea24493ea5fff38b08ac5219587ea035b48e1 Mon Sep 17 00:00:00 2001 From: Esteban Talavera Date: Tue, 19 Dec 2017 11:48:43 +0000 Subject: [PATCH] Fix usagestats DUMP OF SERVICE DUMP OF SERVICE Usagestats was empty in bugreports because an unexpected -a argument was being passed. adb shell pm dump had a similar issue with --packages Change-Id: Ic67c723b8edc74ec7c9c48582b08896ca3430a4a Fix: 70777338 Test: adb shell pm dump and bugreports now contain usage stats --- core/java/android/app/ActivityManager.java | 2 +- .../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 02b7f8c59ea67..b7afad4493ea0 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -3835,7 +3835,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 878fbed18b220..a26d179a6152d 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -492,8 +492,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; }