Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e175a3e0 authored by Sandeep Patil's avatar Sandeep Patil
Browse files

health: use HIDL generated constants in BatteryService 



Test: Make sure 'healthd' in Android and 'charger' in recovery continues
to work.

b/32724915

Change-Id: Ieecd23efb0459e3c0cdd7f09313ee1ded20adddd
Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
parent e773265e

include/batteryservice/BatteryService.h

+1 −19
Original line number Diff line number Diff line
@@ -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 {

include/batteryservice/BatteryServiceConstants.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// 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_