diff options
| author | 2017-11-22 18:27:59 +0000 | |
|---|---|---|
| committer | 2017-11-22 18:27:59 +0000 | |
| commit | 1edf09c99b5aff31b2a9a7d95bef00cf12f50c9f (patch) | |
| tree | 02af8421f7b615b6b26adbaf6340a3483b856f69 | |
| parent | 3daba14f2598956eb2b303e34e39717c326cb8df (diff) | |
| parent | 74ed6ecdc4b97c4d9a06603045b49196d5aad040 (diff) | |
Merge "Fix issue #67019445: Detect BATTERY_LOW/OKAY"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/BatteryManager.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/BatteryService.java | 1 |
5 files changed, 13 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ec13b5560d37..f59bbf7d90e2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30838,6 +30838,7 @@ package android.os { field public static final int BATTERY_STATUS_FULL = 5; // 0x5 field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4 field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1 + field public static final java.lang.String EXTRA_BATTERY_LOW = "battery_low"; field public static final java.lang.String EXTRA_HEALTH = "health"; field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small"; field public static final java.lang.String EXTRA_LEVEL = "level"; diff --git a/api/system-current.txt b/api/system-current.txt index ce3d27795d22..67e45867bbc5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33570,6 +33570,7 @@ package android.os { field public static final int BATTERY_STATUS_FULL = 5; // 0x5 field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4 field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1 + field public static final java.lang.String EXTRA_BATTERY_LOW = "battery_low"; field public static final java.lang.String EXTRA_HEALTH = "health"; field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small"; field public static final java.lang.String EXTRA_LEVEL = "level"; diff --git a/api/test-current.txt b/api/test-current.txt index 8a718f588d70..2eca72f13c99 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -31042,6 +31042,7 @@ package android.os { field public static final int BATTERY_STATUS_FULL = 5; // 0x5 field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4 field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1 + field public static final java.lang.String EXTRA_BATTERY_LOW = "battery_low"; field public static final java.lang.String EXTRA_HEALTH = "health"; field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small"; field public static final java.lang.String EXTRA_LEVEL = "level"; diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 6e0f70c14781..843bdb50dcab 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -18,6 +18,7 @@ package android.os; import android.annotation.SystemService; import android.content.Context; +import android.content.Intent; import android.hardware.health.V1_0.Constants; import com.android.internal.app.IBatteryStats; @@ -56,6 +57,14 @@ public class BatteryManager { /** * Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}: + * Boolean field indicating whether the battery is currently considered to be + * low, that is whether a {@link Intent#ACTION_BATTERY_LOW} broadcast + * has been sent. + */ + public static final String EXTRA_BATTERY_LOW = "battery_low"; + + /** + * Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}: * integer containing the maximum battery level. */ public static final String EXTRA_SCALE = "scale"; diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index ea0ed2719ad0..924e736bab07 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -619,6 +619,7 @@ public final class BatteryService extends SystemService { intent.putExtra(BatteryManager.EXTRA_HEALTH, mHealthInfo.batteryHealth); intent.putExtra(BatteryManager.EXTRA_PRESENT, mHealthInfo.batteryPresent); intent.putExtra(BatteryManager.EXTRA_LEVEL, mHealthInfo.batteryLevel); + intent.putExtra(BatteryManager.EXTRA_BATTERY_LOW, mSentLowBatteryBroadcast); intent.putExtra(BatteryManager.EXTRA_SCALE, BATTERY_SCALE); intent.putExtra(BatteryManager.EXTRA_ICON_SMALL, icon); intent.putExtra(BatteryManager.EXTRA_PLUGGED, mPlugType); |