Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "health: batteryStateOfHealth should be a property"" into udc-dev

Browse Source
This commit is contained in:
Jack Wu
2023-02-22 02:52:43 +00:00
committed by Android (Google) Code Review
parent e89d5d57ba f5a0732d83
commit 1bad00b86c
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/BatteryCapacityLevel.aidl
View File

@@ -34,11 +34,11 @@
package android.hardware.health;
@Backing(type="int") @VintfStability
enum BatteryCapacityLevel {
UNSUPPORTED = (-1) /* -1 */,
UNKNOWN,
CRITICAL,
LOW,
NORMAL,
HIGH,
FULL,
UNSUPPORTED = -1,
UNKNOWN = 0,
CRITICAL = 1,
LOW = 2,
NORMAL = 3,
HIGH = 4,
FULL = 5,
}

1
health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/BatteryHealthData.aidl
View File

@@ -36,5 +36,4 @@ package android.hardware.health;
parcelable BatteryHealthData {
long batteryManufacturingDateSeconds;
long batteryFirstUsageSeconds;
long batteryStateOfHealth;
}

3
health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/HealthInfo.aidl
View File

@@ -57,8 +57,9 @@ parcelable HealthInfo {
android.hardware.health.BatteryCapacityLevel batteryCapacityLevel;
long batteryChargeTimeToFullNowSeconds;
int batteryFullChargeDesignCapacityUah;
int batteryStateOfHealth;
android.hardware.health.BatteryChargingState chargingState;
android.hardware.health.BatteryChargingPolicy chargingPolicy;
@nullable android.hardware.health.BatteryHealthData batteryHealthData;
const int BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED = (-1) /* -1 */;
const int BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED = -1;
}

7
health/aidl/android/hardware/health/BatteryHealthData.aidl
View File

@@ -29,11 +29,4 @@ parcelable BatteryHealthData {
* The date of first usage is reported in epoch.
*/
long batteryFirstUsageSeconds;
/**
* Measured battery state of health (remaining estimate full charge capacity
* relative to the rated capacity in %).
* Value must be 0 if batteryStatus is UNKNOWN.
* Otherwise, value must be in the range 0 to 100.
*/
long batteryStateOfHealth;
}

7
health/aidl/android/hardware/health/HealthInfo.aidl
View File

@@ -136,6 +136,13 @@ parcelable HealthInfo {
* Value must be less than 100 000 000 µAh if known.
*/
int batteryFullChargeDesignCapacityUah;
/**
* Measured battery state of health (remaining estimate full charge capacity
* relative to the rated capacity in %).
* Value must be 0 if batteryStatus is UNKNOWN.
* Otherwise, value must be in the range 0 to 100.
*/
int batteryStateOfHealth;
/**
* Battery charging state
*/

4
health/aidl/vts/functional/VtsHalHealthTargetTest.cpp
View File

@@ -278,10 +278,6 @@ MATCHER(IsValidHealthData, "") {
*result_listener << " for batteryFirstUsageSeconds.";
return false;
}
if (!ExplainMatchResult(Ge(-1), arg.batteryStateOfHealth, result_listener)) {
*result_listener << " for batteryStateOfHealth.";
return false;
}
return true;
}