| commit | eb9d901dfd449d8933360bd3f045372758d5c394 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 25 02:30:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 25 02:30:28 2022 +0000 |
| tree | 93b533b463948e7388df4702506961cb26287c1b | |
| parent | bf1243dc0117055ec213efa9cb580797a0fb8a6e [diff] | |
| parent | 3ab4cb982d5fdb215a9d97b6a9c249d2d86ae7b6 [diff] |
Merge "health: support Dock charging" am: a366ec1a33 am: 3ab4cb982d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1946230 Change-Id: I3e3509265ebe538804bf2d3137071542a3930f4a
diff --git a/health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/HealthInfo.aidl b/health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/HealthInfo.aidl index 34a87a6..97d9e84 100644 --- a/health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/HealthInfo.aidl +++ b/health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/HealthInfo.aidl
@@ -37,6 +37,7 @@ boolean chargerAcOnline; boolean chargerUsbOnline; boolean chargerWirelessOnline; + boolean chargerDockOnline; int maxChargingCurrentMicroamps; int maxChargingVoltageMicrovolts; android.hardware.health.BatteryStatus batteryStatus;
diff --git a/health/aidl/android/hardware/health/HealthInfo.aidl b/health/aidl/android/hardware/health/HealthInfo.aidl index 504e218..5b98baf 100644 --- a/health/aidl/android/hardware/health/HealthInfo.aidl +++ b/health/aidl/android/hardware/health/HealthInfo.aidl
@@ -40,6 +40,10 @@ */ boolean chargerWirelessOnline; /** + * Dock charger state - 'true' if online + */ + boolean chargerDockOnline; + /** * Maximum charging current supported by charger in µA */ int maxChargingCurrentMicroamps;
diff --git a/health/aidl/default/HalHealthLoop.cpp b/health/aidl/default/HalHealthLoop.cpp index c9a081e..ec23c10 100644 --- a/health/aidl/default/HalHealthLoop.cpp +++ b/health/aidl/default/HalHealthLoop.cpp
@@ -61,7 +61,7 @@ void HalHealthLoop::set_charger_online(const HealthInfo& health_info) { charger_online_ = health_info.chargerAcOnline || health_info.chargerUsbOnline || - health_info.chargerWirelessOnline; + health_info.chargerWirelessOnline || health_info.chargerDockOnline; } } // namespace aidl::android::hardware::health
diff --git a/health/aidl/default/health-convert.cpp b/health/aidl/default/health-convert.cpp index b5251f4..6118865 100644 --- a/health/aidl/default/health-convert.cpp +++ b/health/aidl/default/health-convert.cpp
@@ -22,6 +22,7 @@ p->chargerAcOnline = info.chargerAcOnline; p->chargerUsbOnline = info.chargerUsbOnline; p->chargerWirelessOnline = info.chargerWirelessOnline; + p->chargerDockOnline = info.chargerDockOnline; p->maxChargingCurrent = info.maxChargingCurrentMicroamps; p->maxChargingVoltage = info.maxChargingVoltageMicrovolts; p->batteryStatus = static_cast<int>(info.batteryStatus);