Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of c2894474 to gingerbread-plus-aosp

Browse Source 
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
This commit is contained in:
Jean-Baptiste Queru
2010-10-10 17:45:45 -07:00
parent 779d1778b6 c289447439
commit 89fbcd72fb
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/BatteryManager.java
View File

@@ -99,6 +99,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.