diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-05-16 19:42:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 19:42:54 +0000 |
| commit | 3fce73a866e58232b484ca26b58b1394b0121b6a (patch) | |
| tree | ffd76ccf10d7ea1ca639a71c80764a724165bc45 /services | |
| parent | 891e65c5ceff6a7859afab34f75f149b3aefa0c6 (diff) | |
| parent | 9a7554300637902bbb25991ffba41a9b8f682eff (diff) | |
| download | frameworks_base-3fce73a866e58232b484ca26b58b1394b0121b6a.zip frameworks_base-3fce73a866e58232b484ca26b58b1394b0121b6a.tar.gz frameworks_base-3fce73a866e58232b484ca26b58b1394b0121b6a.tar.bz2 | |
Merge "Fix recording of wake_lock_in."
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/BatteryStatsService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 908bfbd..249422b 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -623,8 +623,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub pw.println(" --charged: only output data since last charged."); pw.println(" --reset: reset the stats, clearing all current data."); pw.println(" --write: force write current collected stats to disk."); - pw.println(" --enable: enable an option: full-wake-history."); - pw.println(" --disable: disable an option: full-wake-history."); + pw.println(" --enable: enable an option: full-wake-history, no-auto-reset."); + pw.println(" --disable: disable an option: full-wake-history, no-auto-reset."); pw.println(" -h: print this help text."); pw.println(" <package.name>: optional name of package to filter output by."); } @@ -640,6 +640,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub synchronized (mStats) { mStats.setRecordAllWakeLocksLocked(enable); } + } else if ("no-auto-reset".equals(args[i])) { + synchronized (mStats) { + mStats.setNoAutoReset(enable); + } } else { pw.println("Unknown enable/disable option: " + args[i]); dumpHelp(pw); |