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

Merge "health: support Dock charging" am: a366ec1a33

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1946230

Change-Id: I32ff8498b1a0209220d5e8bee5e8c6703c065847
This commit is contained in:
Treehugger Robot
2022-01-25 02:09:02 +00:00
committed by Automerger Merge Worker
parent 262e40b9ef a366ec1a33
commit 3ab4cb982d
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ parcelable HealthInfo {
boolean chargerAcOnline; boolean chargerAcOnline;
boolean chargerUsbOnline; boolean chargerUsbOnline;
boolean chargerWirelessOnline; boolean chargerWirelessOnline;
boolean chargerDockOnline;
int maxChargingCurrentMicroamps; int maxChargingCurrentMicroamps;
int maxChargingVoltageMicrovolts; int maxChargingVoltageMicrovolts;
android.hardware.health.BatteryStatus batteryStatus; android.hardware.health.BatteryStatus batteryStatus;

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

@@ -39,6 +39,10 @@ parcelable HealthInfo {
* Wireless charger state - 'true' if online * Wireless charger state - 'true' if online
*/ */
boolean chargerWirelessOnline; boolean chargerWirelessOnline;
/**
* Dock charger state - 'true' if online
*/
boolean chargerDockOnline;
/** /**
* Maximum charging current supported by charger in µA * Maximum charging current supported by charger in µA
*/ */

2
health/aidl/default/HalHealthLoop.cpp
View File

@@ -61,7 +61,7 @@ void HalHealthLoop::OnHealthInfoChanged(const HealthInfo& health_info) {
void HalHealthLoop::set_charger_online(const HealthInfo& health_info) { void HalHealthLoop::set_charger_online(const HealthInfo& health_info) {
charger_online_ = health_info.chargerAcOnline || health_info.chargerUsbOnline || charger_online_ = health_info.chargerAcOnline || health_info.chargerUsbOnline ||
health_info.chargerWirelessOnline; health_info.chargerWirelessOnline || health_info.chargerDockOnline;
} }
} // namespace aidl::android::hardware::health } // namespace aidl::android::hardware::health

1
health/aidl/default/health-convert.cpp
View File

@@ -22,6 +22,7 @@ void convert(const HealthInfo& info, struct ::android::BatteryProperties* p) {
p->chargerAcOnline = info.chargerAcOnline; p->chargerAcOnline = info.chargerAcOnline;
p->chargerUsbOnline = info.chargerUsbOnline; p->chargerUsbOnline = info.chargerUsbOnline;
p->chargerWirelessOnline = info.chargerWirelessOnline; p->chargerWirelessOnline = info.chargerWirelessOnline;
p->chargerDockOnline = info.chargerDockOnline;
p->maxChargingCurrent = info.maxChargingCurrentMicroamps; p->maxChargingCurrent = info.maxChargingCurrentMicroamps;
p->maxChargingVoltage = info.maxChargingVoltageMicrovolts; p->maxChargingVoltage = info.maxChargingVoltageMicrovolts;
p->batteryStatus = static_cast<int>(info.batteryStatus); p->batteryStatus = static_cast<int>(info.batteryStatus);