Skip to content

Commit a4d8204

Browse files
author
Jeff Brown
committed
Fix some synchronization issues in BatteryService.
Some of the BatteryService state was being locked sometimes and it wasn't at all consistent. Bug: 7158734 Change-Id: I46e75f66fde92c5a577a80a6bd99c9573066f3c1
1 parent cb882f9 commit a4d8204

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)