diff options
| author | Brian Muramatsu <btmura@google.com> | 2012-08-14 15:21:02 -0700 |
|---|---|---|
| committer | Brian Muramatsu <btmura@google.com> | 2012-08-20 10:04:12 -0700 |
| commit | 37a37f445cbcd64376af153dd79ea2a123d9405d (patch) | |
| tree | 7b2ae5f75d4c6bff056472da64752473e1d211f9 /core | |
| parent | 82d53ce283b7c275624d66e9bf20cfe2614af5c4 (diff) | |
| download | frameworks_base-37a37f445cbcd64376af153dd79ea2a123d9405d.zip frameworks_base-37a37f445cbcd64376af153dd79ea2a123d9405d.tar.gz frameworks_base-37a37f445cbcd64376af153dd79ea2a123d9405d.tar.bz2 | |
add wireless charger support
bug: 6879638
- add new enum value BATTERY_PLUGGED_WIRELESS
- check for sys online file with contents "Wireless"
Change-Id: I22dc3c40f50573c98643e7b5cbcb237d0216530d
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/BatteryManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 3 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index c62715b..7b16f4d 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -115,4 +115,6 @@ public class BatteryManager { public static final int BATTERY_PLUGGED_AC = 1; /** Power source is a USB port. */ public static final int BATTERY_PLUGGED_USB = 2; + /** Power source is wireless. */ + public static final int BATTERY_PLUGGED_WIRELESS = 4; } diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index fcc0ae4..54f2fe3 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -2071,6 +2071,9 @@ public abstract class BatteryStats implements Parcelable { case BatteryManager.BATTERY_PLUGGED_USB: pw.print("usb"); break; + case BatteryManager.BATTERY_PLUGGED_WIRELESS: + pw.print("wireless"); + break; default: pw.print(oldPlug); break; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6dbba46..28273f0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1147,6 +1147,7 @@ public final class Settings { * <li>{@code 0} to never stay on while plugged in</li> * <li>{@link BatteryManager#BATTERY_PLUGGED_AC} to stay on for AC charger</li> * <li>{@link BatteryManager#BATTERY_PLUGGED_USB} to stay on for USB charger</li> + * <li>{@link BatteryManager#BATTERY_PLUGGED_WIRELESS} to stay on for wireless charger</li> * </ul> * These values can be OR-ed together. */ |