diff options
| author | 2015-08-19 19:01:16 +0000 | |
|---|---|---|
| committer | 2015-08-19 19:01:16 +0000 | |
| commit | e264f9a51ef2158df345c3c4b19dd6098e959141 (patch) | |
| tree | 4f2c4acd4e0df556f2d34529dcb85fac3815dc44 | |
| parent | 283e907af480965c22c7816eeda79df35951bee2 (diff) | |
| parent | 5a1234fabf73224d107ce0715682728b35357203 (diff) | |
am 5a1234fa: am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '5a1234fabf73224d107ce0715682728b35357203':
Fix issue #23326715: Clarify --checkin/-c options in batterystats
| -rw-r--r-- | core/java/com/android/internal/os/BatteryStatsImpl.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/BatteryStatsService.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 6c7e2984bb4c..4ff786987028 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -25,7 +25,6 @@ import android.net.ConnectivityManager; import android.net.NetworkStats; import android.net.wifi.WifiActivityEnergyInfo; import android.net.wifi.WifiManager; -import android.os.BadParcelableException; import android.os.BatteryManager; import android.os.BatteryStats; import android.os.Build; diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index d0f68f039aa1..9bf4f5f8907e 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."); |