diff options
| author | 2016-11-11 18:57:41 +0000 | |
|---|---|---|
| committer | 2016-11-11 18:57:51 +0000 | |
| commit | cd7dedbe69f8c90d351b97b1acea2bb3635b68ca (patch) | |
| tree | 8c93bc2e2dbd83ad2aa1b8917fe2baf296927939 | |
| parent | 17829541efa5ee0bdb8ee162b098f5c6c1cb500f (diff) | |
| parent | e175a3e023f8e868a76185ccc4e32f365777c6d4 (diff) | |
Merge "health: use HIDL generated constants in BatteryService"
| -rw-r--r-- | include/batteryservice/BatteryService.h | 20 | ||||
| -rw-r--r-- | include/batteryservice/BatteryServiceConstants.h | 32 |
2 files changed, 33 insertions, 19 deletions
diff --git a/include/batteryservice/BatteryService.h b/include/batteryservice/BatteryService.h index b3999058bb..30d73170e8 100644 --- a/include/batteryservice/BatteryService.h +++ b/include/batteryservice/BatteryService.h @@ -24,25 +24,7 @@ namespace android { -// must be kept in sync with definitions in BatteryManager.java -enum { - BATTERY_STATUS_UNKNOWN = 1, // equals BatteryManager.BATTERY_STATUS_UNKNOWN constant - BATTERY_STATUS_CHARGING = 2, // equals BatteryManager.BATTERY_STATUS_CHARGING constant - BATTERY_STATUS_DISCHARGING = 3, // equals BatteryManager.BATTERY_STATUS_DISCHARGING constant - BATTERY_STATUS_NOT_CHARGING = 4, // equals BatteryManager.BATTERY_STATUS_NOT_CHARGING constant - BATTERY_STATUS_FULL = 5, // equals BatteryManager.BATTERY_STATUS_FULL constant -}; - -// must be kept in sync with definitions in BatteryManager.java -enum { - BATTERY_HEALTH_UNKNOWN = 1, // equals BatteryManager.BATTERY_HEALTH_UNKNOWN constant - BATTERY_HEALTH_GOOD = 2, // equals BatteryManager.BATTERY_HEALTH_GOOD constant - BATTERY_HEALTH_OVERHEAT = 3, // equals BatteryManager.BATTERY_HEALTH_OVERHEAT constant - BATTERY_HEALTH_DEAD = 4, // equals BatteryManager.BATTERY_HEALTH_DEAD constant - BATTERY_HEALTH_OVER_VOLTAGE = 5, // equals BatteryManager.BATTERY_HEALTH_OVER_VOLTAGE constant - BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6, // equals BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE constant - BATTERY_HEALTH_COLD = 7, // equals BatteryManager.BATTERY_HEALTH_COLD constant -}; +#include "BatteryServiceConstants.h" // must be kept in sync with definitions in BatteryProperty.java enum { diff --git a/include/batteryservice/BatteryServiceConstants.h b/include/batteryservice/BatteryServiceConstants.h new file mode 100644 index 0000000000..8a90a12f2b --- /dev/null +++ b/include/batteryservice/BatteryServiceConstants.h @@ -0,0 +1,32 @@ +// This file is autogenerated by hidl-gen. Do not edit manually. + +#ifndef HIDL_GENERATED_android_hardware_health_V1_0_EXPORTED_CONSTANTS_H_ +#define HIDL_GENERATED_android_hardware_health_V1_0_EXPORTED_CONSTANTS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +enum { + BATTERY_STATUS_UNKNOWN = 1, + BATTERY_STATUS_CHARGING = 2, + BATTERY_STATUS_DISCHARGING = 3, + BATTERY_STATUS_NOT_CHARGING = 4, + BATTERY_STATUS_FULL = 5, +}; + +enum { + BATTERY_HEALTH_UNKNOWN = 1, + BATTERY_HEALTH_GOOD = 2, + BATTERY_HEALTH_OVERHEAT = 3, + BATTERY_HEALTH_DEAD = 4, + BATTERY_HEALTH_OVER_VOLTAGE = 5, + BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6, + BATTERY_HEALTH_COLD = 7, +}; + +#ifdef __cplusplus +} +#endif + +#endif // HIDL_GENERATED_android_hardware_health_V1_0_EXPORTED_CONSTANTS_H_ |