diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-09-04 18:03:40 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2013-09-04 18:03:40 -0700 |
| commit | 49021f5f790c31f62d4cee9fafcae13505bed798 (patch) | |
| tree | 66b5d82067e10c6d0008ec87e56ed65408d2cb5d /services | |
| parent | 52ea7f57ed08ea982dcb125b564b5509ef8dc3b6 (diff) | |
| download | frameworks_base-49021f5f790c31f62d4cee9fafcae13505bed798.zip frameworks_base-49021f5f790c31f62d4cee9fafcae13505bed798.tar.gz frameworks_base-49021f5f790c31f62d4cee9fafcae13505bed798.tar.bz2 | |
Fix issue #10422349: Limit/change the battery history data in batterystats
Don't include history in real checkins; have a new compact option
for bug reports.
Change-Id: I077f9218b365154f6bae9cc685c2c6b378e0283a
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/BatteryStatsService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java index 12cad7b..0dd950e 100644 --- a/services/java/com/android/server/am/BatteryStatsService.java +++ b/services/java/com/android/server/am/BatteryStatsService.java @@ -481,7 +481,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub { private void dumpHelp(PrintWriter pw) { pw.println("Battery stats (batterystats) dump options:"); - pw.println(" [--checkin] [--unplugged] [--reset] [--write] [-h] [<package.name>]"); + pw.println(" [--checkin] [-c] [--unplugged] [--reset] [--write] [-h] [<package.name>]"); pw.println(" --checkin: format output for a checkin report."); pw.println(" --unplugged: only output data since last unplugged."); pw.println(" --reset: reset the stats, clearing all current data."); @@ -501,6 +501,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub { } boolean isCheckin = false; + boolean includeHistory = false; boolean isUnpluggedOnly = false; boolean noOutput = false; int reqUid = -1; @@ -508,6 +509,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub { for (String arg : args) { if ("--checkin".equals(arg)) { isCheckin = true; + } else if ("-c".equals(arg)) { + isCheckin = true; + includeHistory = true; } else if ("--unplugged".equals(arg)) { isUnpluggedOnly = true; } else if ("--reset".equals(arg)) { @@ -550,7 +554,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub { if (isCheckin) { List<ApplicationInfo> apps = mContext.getPackageManager().getInstalledApplications(0); synchronized (mStats) { - mStats.dumpCheckinLocked(pw, apps, isUnpluggedOnly); + mStats.dumpCheckinLocked(pw, apps, isUnpluggedOnly, includeHistory); } } else { synchronized (mStats) { |