summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-19 18:31:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-19 18:31:20 +0000
commit5c577bab3b4cd9bf74a09368be5d73aed627f6a5 (patch)
treee3afa5474d72318c43e08a71f0d28b98bc670aca /services
parent399237f825863f8d52336778debde8c54313cca2 (diff)
parent29cd880890825ce15a1b2da977bcb1796db6f4e3 (diff)
downloadframeworks_base-5c577bab3b4cd9bf74a09368be5d73aed627f6a5.zip
frameworks_base-5c577bab3b4cd9bf74a09368be5d73aed627f6a5.tar.gz
frameworks_base-5c577bab3b4cd9bf74a09368be5d73aed627f6a5.tar.bz2
am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3': Fix issue #23326715: Clarify --checkin/-c options in batterystats
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/am/BatteryStatsService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java
index d0f68f0..9bf4f5f 100644
--- a/services/core/java/com/android/server/am/BatteryStatsService.java
+++ b/services/core/java/com/android/server/am/BatteryStatsService.java
@@ -975,7 +975,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub
pw.println("Battery stats (batterystats) dump options:");
pw.println(" [--checkin] [--history] [--history-start] [--charged] [-c]");
pw.println(" [--daily] [--reset] [--write] [--new-daily] [--read-daily] [-h] [<package.name>]");
- pw.println(" --checkin: format output for a checkin report.");
+ pw.println(" --checkin: generate output for a checkin report; will write (and clear) the");
+ pw.println(" last old completed stats when they had been reset.");
+ pw.println(" --c: write the current stats in checkin format.");
pw.println(" --history: show only history data.");
pw.println(" --history-start <num>: show only history data starting at given time offset.");
pw.println(" --charged: only output data since last charged.");