Merge "batteryservice: update BatteryHealth type" (5a2345bd) · Commits · e / os / android_frameworks_native

services/batteryservice/include/batteryservice/BatteryService.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@ enum {
		BATTERY_PROP_CAPACITY = 4, // equals BATTERY_PROPERTY_CAPACITY
		BATTERY_PROP_ENERGY_COUNTER = 5, // equals BATTERY_PROPERTY_ENERGY_COUNTER
		BATTERY_PROP_BATTERY_STATUS = 6, // equals BATTERY_PROPERTY_BATTERY_STATUS
		BATTERY_PROP_CHARGING_POLICY = 7, // equals BATTERY_PROPERTY_CHARGING_POLICY
		BATTERY_PROP_MANUFACTURING_DATE = 8, // equals BATTERY_PROPERTY_MANUFACTURING_DATE
		BATTERY_PROP_FIRST_USAGE_DATE = 9, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE
		};

		struct BatteryProperties {

+18 −5

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_
		#ifndef AIDL_android_hardware_health_V2_EXPORTED_CONSTANTS_H_
		#define AIDL_android_hardware_health_V2_EXPORTED_CONSTANTS_H_

		#ifdef __cplusplus
		extern "C" {
		@@ -15,6 +13,8 @@ enum {
		BATTERY_STATUS_FULL = 5,
		};

		// must be kept in sync with definitions in
		// hardware/interfaces/health/aidl/android/hardware/health/BatteryHealth.aidl
		enum {
		BATTERY_HEALTH_UNKNOWN = 1,
		BATTERY_HEALTH_GOOD = 2,
		@@ -23,10 +23,23 @@ enum {
		BATTERY_HEALTH_OVER_VOLTAGE = 5,
		BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6,
		BATTERY_HEALTH_COLD = 7,
		BATTERY_HEALTH_FAIR = 8,
		BATTERY_HEALTH_NOT_AVAILABLE = 11,
		BATTERY_HEALTH_INCONSISTENT = 12,
		};

		// must be kept in sync with definitions in
		// hardware/interfaces/health/aidl/android/hardware/health/BatteryChargingState.aidl
		enum {
		BATTERY_STATUS_NORMAL = 1,
		BATTERY_STATUS_TOO_COLD = 2,
		BATTERY_STATUS_TOO_HOT = 3,
		BATTERY_STATUS_LONG_LIFE = 4,
		BATTERY_STATUS_ADAPTIVE = 5,
		};

		#ifdef __cplusplus
		}
		#endif

		#endif // HIDL_GENERATED_android_hardware_health_V1_0_EXPORTED_CONSTANTS_H_
		#endif // AIDL_android_hardware_health_V2_EXPORTED_CONSTANTS_H_