tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "health: batteryStateOfHealth should be a property"

Browse source 
This reverts commit a60e7a43a9.

Reason for revert: merge to aosp first
Bug: 251427118
Test: m android.hardware.health-update-api

Change-Id: If56fe4b141b3ad31b7f859118e432f08915c98f3
Signed-off-by: Jack Wu <wjack@google.com>
This commit is contained in:
Jack Wu 2023-02-19 01:35:53 +08:00
parent dd9febd153
commit f5a0732d83
6 changed files with 16 additions and 20 deletions
Show stats 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;
}