summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2014-05-08 15:12:50 -0700
committerTodd Poynor <toddpoynor@google.com>2014-05-16 03:04:33 +0000
commit540f4d6db34905b38ee1095ef35fe98d3fa38a9e (patch)
tree27c06fc92c5f8f9e98e8f0ee95dbff059db7510c /api
parent07d5e7d5fa971c60776fe6388467b77e7d3f1970 (diff)
downloadframeworks_base-540f4d6db34905b38ee1095ef35fe98d3fa38a9e.zip
frameworks_base-540f4d6db34905b38ee1095ef35fe98d3fa38a9e.tar.gz
frameworks_base-540f4d6db34905b38ee1095ef35fe98d3fa38a9e.tar.bz2
BatteryManager: Add property ENERGY_COUNTER and long data type properties
Change-Id: Ie7f9b19c5cd47a48bb33af03d51acddaa14b0243
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 8e2c9f1..3d6d41c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19578,6 +19578,7 @@ package android.os {
public class BatteryProperty implements android.os.Parcelable {
method public int describeContents();
method public int getInt();
+ method public long getLong();
method public void readFromParcel(android.os.Parcel);
method public void writeToParcel(android.os.Parcel, int);
field public static final int CAPACITY = 4; // 0x4
@@ -19585,6 +19586,7 @@ package android.os {
field public static final android.os.Parcelable.Creator CREATOR;
field public static final int CURRENT_AVERAGE = 3; // 0x3
field public static final int CURRENT_NOW = 2; // 0x2
+ field public static final int ENERGY_COUNTER = 4; // 0x4
}
public class Binder implements android.os.IBinder {