Skip to content

Commit 5558b79

Browse files
Jeff BrownAndroid (Google) Code Review
authored andcommitted
Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
2 parents 6bcd732 + a4d8204 commit 5558b79

File tree

4 files changed

+179
-139
lines changed

4 files changed

+179
-139
lines changed

core/java/android/os/BatteryManager.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,8 @@ public class BatteryManager {
117117
public static final int BATTERY_PLUGGED_USB = 2;
118118
/** Power source is wireless. */
119119
public static final int BATTERY_PLUGGED_WIRELESS = 4;
120+
121+
/** @hide */
122+
public static final int BATTERY_PLUGGED_ANY =
123+
BATTERY_PLUGGED_AC | BATTERY_PLUGGED_USB | BATTERY_PLUGGED_WIRELESS;
120124
}

0 commit comments

Comments
 (0)