OSDN Git Service

Fix recording of wake_lock_in.
authorDianne Hackborn <hackbod@google.com>
Fri, 16 May 2014 00:05:22 +0000 (17:05 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 16 May 2014 22:22:55 +0000 (15:22 -0700)
commit203c1de010c95434c7d74cb7e949e59a05cbe317
tree5dcbb39a9034067db405290fb99137261761afba
parentb694cfa81a62b418048a804a0406f197d0c2be64
Fix recording of wake_lock_in.

There was a bug that would allow the nesting count
to get off.  Also better documentation of times in
HistoryItem, and new option to disable resetting of
the stats when unplugging.

Change-Id: If1b39a02475c5b620c67b700a323a6d0462d5c61
core/java/android/os/BatteryStats.java
core/java/com/android/internal/os/BatteryStatsImpl.java
services/core/java/com/android/server/am/BatteryStatsService.java