c2f518a9dd4b625e52e2c424f288fb5d4d430b45 - platform/frameworks/base

commit	c2f518a9dd4b625e52e2c424f288fb5d4d430b45	[log] [tgz]
author	Mike Ma <yanmin@google.com>	Tue Sep 19 16:06:03 2017 -0700
committer	Mike Ma <yanmin@google.com>	Thu Oct 05 15:28:55 2017 -0700
tree	5ea26d82338f9afb4bfeef07fc6208c517374a97
parent	30e7ca0f6e05760f5378612805f611f602c1a4c8 [diff]

Add AOD metrics in batterystats

Fixes: 64899521
Test: manual - flash build, reset batteryStats, use device > 1 hr
with alternating pattern between screen on/off/AOD. Dump stats, check
all screen related stats look normal, esp. record matches actual time
spent in each screen state. In raw bugreport:
Search "amount discharged" for % discharge;
Search "Screen on/off/doze discharge" for mAh discharge;
Search "time on battery" for up/real time in each state.

Test: Added two unit tests for note AOD screen state
Change-Id: I7193a36751124dd380818b2b665303c0f0d8c984

core/java/android/os/BatteryStats.java[diff]
core/java/com/android/internal/os/BatteryStatsImpl.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsBackgroundStatsTest.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsCpuTimesTest.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsNoteTest.java[diff]
core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java[diff]
core/tests/coretests/src/com/android/internal/os/MockBatteryStatsImpl.java[diff]

7 files changed

tree: 5ea26d82338f9afb4bfeef07fc6208c517374a97