diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-09-05 01:21:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 01:21:32 +0000 |
| commit | 8144585c5853d5f2dd5f30e4ab9c0abe7457d556 (patch) | |
| tree | 7b9f30405767f2fae8ab45fc00e61e58df72f035 /core/java | |
| parent | e4bcd1b71408216cc5cdaf8d74001da611828f00 (diff) | |
| parent | 49021f5f790c31f62d4cee9fafcae13505bed798 (diff) | |
| download | frameworks_base-8144585c5853d5f2dd5f30e4ab9c0abe7457d556.zip frameworks_base-8144585c5853d5f2dd5f30e4ab9c0abe7457d556.tar.gz frameworks_base-8144585c5853d5f2dd5f30e4ab9c0abe7457d556.tar.bz2 | |
Merge "Fix issue #10422349: Limit/change the battery history data in batterystats" into klp-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 38ffb96..dbaa325 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -2380,22 +2380,25 @@ public abstract class BatteryStats implements Parcelable { @SuppressWarnings("unused") public void dumpCheckinLocked( - PrintWriter pw, List<ApplicationInfo> apps, boolean isUnpluggedOnly) { + PrintWriter pw, List<ApplicationInfo> apps, boolean isUnpluggedOnly, + boolean includeHistory) { prepareForDumpLocked(); long now = getHistoryBaseTime() + SystemClock.elapsedRealtime(); - final HistoryItem rec = new HistoryItem(); - if (startIteratingHistoryLocked()) { - HistoryPrinter hprinter = new HistoryPrinter(); - while (getNextHistoryLocked(rec)) { - pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); - pw.print(0); pw.print(','); - pw.print(HISTORY_DATA); pw.print(','); - hprinter.printNextItemCheckin(pw, rec, now); - pw.println(); + if (includeHistory) { + final HistoryItem rec = new HistoryItem(); + if (startIteratingHistoryLocked()) { + HistoryPrinter hprinter = new HistoryPrinter(); + while (getNextHistoryLocked(rec)) { + pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); + pw.print(0); pw.print(','); + pw.print(HISTORY_DATA); pw.print(','); + hprinter.printNextItemCheckin(pw, rec, now); + pw.println(); + } + finishIteratingHistoryLocked(); } - finishIteratingHistoryLocked(); } if (apps != null) { |