diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-11 17:49:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 17:49:42 -0700 |
| commit | 02241ab2929c34aa48acdf4befcc9cacd86c1a6f (patch) | |
| tree | d8c5accddfb06cf620d40deb095aee851b118d73 /core | |
| parent | 76f8688e9b9a71cb064119022a3f69c2e17b8b65 (diff) | |
| parent | 89fbcd72fbe6ef26ea2703f8e338fd198c958ecc (diff) | |
| download | frameworks_base-02241ab2929c34aa48acdf4befcc9cacd86c1a6f.zip frameworks_base-02241ab2929c34aa48acdf4befcc9cacd86c1a6f.tar.gz frameworks_base-02241ab2929c34aa48acdf4befcc9cacd86c1a6f.tar.bz2 | |
am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'
* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
Support showing "Cold" battery health.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/BatteryManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 5fd2246..247b281 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -107,6 +107,7 @@ public class BatteryManager { public static final int BATTERY_HEALTH_DEAD = 4; public static final int BATTERY_HEALTH_OVER_VOLTAGE = 5; public static final int BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6; + public static final int BATTERY_HEALTH_COLD = 7; // values of the "plugged" field in the ACTION_BATTERY_CHANGED intent. // These must be powers of 2. |