From a21c42769f5d144f3e9fe8884cc3b84cbb869fd2 Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 10 Nov 2016 14:02:45 -0800 Subject: [PATCH] health: import android.hardware.health@1.0 constants into BatteryManager Test: make Bug: b/32724915 Change-Id: I7ca7507b7be54442dc3250b02db3e4f7e95f0685 Signed-off-by: Sandeep Patil --- Android.mk | 1 + core/java/android/os/BatteryManager.java | 25 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Android.mk b/Android.mk index 6f96803476558..32ebe5b22fa60 100644 --- a/Android.mk +++ b/Android.mk @@ -517,6 +517,7 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncyca LOCAL_STATIC_JAVA_LIBRARIES := \ framework-protos \ android.hardware.thermal@1.0-java-constants \ + android.hardware.health@1.0-java-constants \ LOCAL_MODULE := framework diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 252385faf0899..263750aa9946f 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -16,6 +16,7 @@ package android.os; +import android.hardware.health.V1_0.Constants; import com.android.internal.app.IBatteryStats; /** @@ -118,20 +119,20 @@ public class BatteryManager { public static final String EXTRA_CHARGE_COUNTER = "charge_counter"; // values for "status" field in the ACTION_BATTERY_CHANGED Intent - public static final int BATTERY_STATUS_UNKNOWN = 1; - public static final int BATTERY_STATUS_CHARGING = 2; - public static final int BATTERY_STATUS_DISCHARGING = 3; - public static final int BATTERY_STATUS_NOT_CHARGING = 4; - public static final int BATTERY_STATUS_FULL = 5; + public static final int BATTERY_STATUS_UNKNOWN = Constants.BATTERY_STATUS_UNKNOWN; + public static final int BATTERY_STATUS_CHARGING = Constants.BATTERY_STATUS_CHARGING; + public static final int BATTERY_STATUS_DISCHARGING = Constants.BATTERY_STATUS_DISCHARGING; + public static final int BATTERY_STATUS_NOT_CHARGING = Constants.BATTERY_STATUS_NOT_CHARGING; + public static final int BATTERY_STATUS_FULL = Constants.BATTERY_STATUS_FULL; // values for "health" field in the ACTION_BATTERY_CHANGED Intent - public static final int BATTERY_HEALTH_UNKNOWN = 1; - public static final int BATTERY_HEALTH_GOOD = 2; - public static final int BATTERY_HEALTH_OVERHEAT = 3; - public static final int BATTERY_HEALTH_DEAD = 4; - public static final int BATTERY_HEALTH_OVER_VOLTAGE = 5; - public static final int BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6; - public static final int BATTERY_HEALTH_COLD = 7; + public static final int BATTERY_HEALTH_UNKNOWN = Constants.BATTERY_HEALTH_UNKNOWN; + public static final int BATTERY_HEALTH_GOOD = Constants.BATTERY_HEALTH_GOOD; + public static final int BATTERY_HEALTH_OVERHEAT = Constants.BATTERY_HEALTH_OVERHEAT; + public static final int BATTERY_HEALTH_DEAD = Constants.BATTERY_HEALTH_DEAD; + public static final int BATTERY_HEALTH_OVER_VOLTAGE = Constants.BATTERY_HEALTH_OVER_VOLTAGE; + public static final int BATTERY_HEALTH_UNSPECIFIED_FAILURE = Constants.BATTERY_HEALTH_UNSPECIFIED_FAILURE; + public static final int BATTERY_HEALTH_COLD = Constants.BATTERY_HEALTH_COLD; // values of the "plugged" field in the ACTION_BATTERY_CHANGED intent. // These must be powers of 2.