From edf0a3715da497784d810d0b07e4827d54a887ac Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Fri, 3 Feb 2017 11:08:37 -0800 Subject: [PATCH] BatteryManager: Add battery status to getProperty Bug: 34198239 Change-Id: I65cef6864b1074445342e18f49c7cecd0706b938 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/os/BatteryManager.java | 5 +++++ 4 files changed, 8 insertions(+) diff --git a/api/current.txt b/api/current.txt index b06307228683f..73d4fa391b181 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29856,6 +29856,7 @@ package android.os { field public static final int BATTERY_PLUGGED_AC = 1; // 0x1 field public static final int BATTERY_PLUGGED_USB = 2; // 0x2 field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4 + field public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; // 0x6 field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4 field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1 field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3 diff --git a/api/system-current.txt b/api/system-current.txt index 71d09f933301e..bceea0feaf9c7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32570,6 +32570,7 @@ package android.os { field public static final int BATTERY_PLUGGED_AC = 1; // 0x1 field public static final int BATTERY_PLUGGED_USB = 2; // 0x2 field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4 + field public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; // 0x6 field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4 field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1 field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3 diff --git a/api/test-current.txt b/api/test-current.txt index 678aec9869bdd..6a70acd095a04 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -29948,6 +29948,7 @@ package android.os { field public static final int BATTERY_PLUGGED_AC = 1; // 0x1 field public static final int BATTERY_PLUGGED_USB = 2; // 0x2 field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4 + field public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; // 0x6 field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4 field public static final int BATTERY_PROPERTY_CHARGE_COUNTER = 1; // 0x1 field public static final int BATTERY_PROPERTY_CURRENT_AVERAGE = 3; // 0x3 diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 263750aa9946f..3a441c7cb1ca8 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -201,6 +201,11 @@ public class BatteryManager { */ public static final int BATTERY_PROPERTY_ENERGY_COUNTER = 5; + /** + * Battery charge status, from a BATTERY_STATUS_* value. + */ + public static final int BATTERY_PROPERTY_BATTERY_STATUS = 6; + private final IBatteryStats mBatteryStats; private final IBatteryPropertiesRegistrar mBatteryPropertiesRegistrar;