diff options
| author | Todd Poynor <toddpoynor@google.com> | 2014-04-15 22:16:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-15 22:16:13 +0000 |
| commit | 7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8 (patch) | |
| tree | 2a1f51f727f293ce4f7ded67fc85ce85842a7ad5 /api | |
| parent | 7ec8b21a06364357976b6b60a12a49b255ac39eb (diff) | |
| parent | e35872da97ac6bd07d2d9ac5af8a7c18ad290718 (diff) | |
| download | frameworks_base-7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8.zip frameworks_base-7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8.tar.gz frameworks_base-7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8.tar.bz2 | |
Merge "BatteryManager: Add API and service for battery property retrieval"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 4e40549..3e1c3ed 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6467,6 +6467,7 @@ package android.content { field public static final java.lang.String ALARM_SERVICE = "alarm"; field public static final java.lang.String APP_OPS_SERVICE = "appops"; field public static final java.lang.String AUDIO_SERVICE = "audio"; + field public static final java.lang.String BATTERY_SERVICE = "batterymanager"; field public static final int BIND_ABOVE_CLIENT = 8; // 0x8 field public static final int BIND_ADJUST_WITH_ACTIVITY = 128; // 0x80 field public static final int BIND_ALLOW_OOM_MANAGEMENT = 16; // 0x10 @@ -18977,6 +18978,7 @@ package android.os { public class BatteryManager { ctor public BatteryManager(); + method public android.os.BatteryProperty getProperty(int) throws android.os.RemoteException; field public static final int BATTERY_HEALTH_COLD = 7; // 0x7 field public static final int BATTERY_HEALTH_DEAD = 4; // 0x4 field public static final int BATTERY_HEALTH_GOOD = 2; // 0x2 @@ -19004,6 +19006,18 @@ package android.os { field public static final java.lang.String EXTRA_VOLTAGE = "voltage"; } + public class BatteryProperty implements android.os.Parcelable { + method public int describeContents(); + method public int getInt(); + method public void readFromParcel(android.os.Parcel); + method public void writeToParcel(android.os.Parcel, int); + field public static final int CAPACITY = 4; // 0x4 + field public static final int CHARGE_COUNTER = 1; // 0x1 + 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 + } + public class Binder implements android.os.IBinder { ctor public Binder(); method public void attachInterface(android.os.IInterface, java.lang.String); |