diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-03-20 00:43:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-20 00:43:37 +0000 |
| commit | 024a003d4c5b558ad5580cde4a99c2180bcd77fa (patch) | |
| tree | 83f3bc2966ccd01721fbe81b4c316b136961b4b6 /core/java/android | |
| parent | 5c3f7236e6f5c6eeb3d3a7da4ba5ff5a7cb08651 (diff) | |
| parent | 40c8725804f46c9d53f2815e0ee69e6cfb0152cc (diff) | |
| download | frameworks_base-024a003d4c5b558ad5580cde4a99c2180bcd77fa.zip frameworks_base-024a003d4c5b558ad5580cde4a99c2180bcd77fa.tar.gz frameworks_base-024a003d4c5b558ad5580cde4a99c2180bcd77fa.tar.bz2 | |
Merge "batstats: fix wake lock tracking, service bug"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 7db4ac2..b0d94d5 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -570,13 +570,15 @@ public abstract class BatteryStats implements Parcelable { public static final int STATE_PHONE_IN_CALL_FLAG = 1<<18; public static final int STATE_WIFI_ON_FLAG = 1<<17; public static final int STATE_BLUETOOTH_ON_FLAG = 1<<16; - + public static final int MOST_INTERESTING_STATES = STATE_BATTERY_PLUGGED_FLAG | STATE_SCREEN_ON_FLAG | STATE_GPS_ON_FLAG | STATE_PHONE_IN_CALL_FLAG; public int states; + public int states2; + // The wake lock that was acquired at this point. public HistoryTag wakelockTag; @@ -1216,6 +1218,11 @@ public abstract class BatteryStats implements Parcelable { public abstract int getHighDischargeAmountSinceCharge(); /** + * Retrieve the discharge amount over the selected discharge period <var>which</var>. + */ + public abstract int getDischargeAmount(int which); + + /** * Get the amount the battery has discharged while the screen was on, * since the last time power was unplugged. */ |