diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-10-02 23:28:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 23:28:02 -0700 |
| commit | 5558b79e7a40adb3ad550e8bdf37996ddbeb714f (patch) | |
| tree | 87fb794119bc6382adc0917b3c5648e7df92b505 /core | |
| parent | 6bcd73203ada36b446b05fa33f9834ac989c0621 (diff) | |
| parent | a4d8204e3068b9d8d6908d4cf3440e81967867a3 (diff) | |
| download | frameworks_base-5558b79e7a40adb3ad550e8bdf37996ddbeb714f.zip frameworks_base-5558b79e7a40adb3ad550e8bdf37996ddbeb714f.tar.gz frameworks_base-5558b79e7a40adb3ad550e8bdf37996ddbeb714f.tar.bz2 | |
Merge "Fix some synchronization issues in BatteryService." into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/BatteryManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 7b16f4d..2e38960 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -117,4 +117,8 @@ public class BatteryManager { public static final int BATTERY_PLUGGED_USB = 2; /** Power source is wireless. */ public static final int BATTERY_PLUGGED_WIRELESS = 4; + + /** @hide */ + public static final int BATTERY_PLUGGED_ANY = + BATTERY_PLUGGED_AC | BATTERY_PLUGGED_USB | BATTERY_PLUGGED_WIRELESS; } |