Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a288e41 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "health: support Dock charging" am: a366ec1a am: 3ab4cb98 am: eb9d901d 

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

Change-Id: I029b2fb5e21647ae15c6b31a153fc3ac87380113
parents b4f96158 eb9d901d

health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/HealthInfo.aidl

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ parcelable HealthInfo { 
  boolean chargerAcOnline;

  boolean chargerUsbOnline;

  boolean chargerWirelessOnline;

  boolean chargerDockOnline;

  int maxChargingCurrentMicroamps;

  int maxChargingVoltageMicrovolts;

  android.hardware.health.BatteryStatus batteryStatus;

health/aidl/android/hardware/health/HealthInfo.aidl

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ parcelable HealthInfo { 
     * Wireless charger state - 'true' if online

     */

    boolean chargerWirelessOnline;

    /**

     * Dock charger state - 'true' if online

     */

    boolean chargerDockOnline;

    /**

     * Maximum charging current supported by charger in µA

     */

health/aidl/default/HalHealthLoop.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void HalHealthLoop::OnHealthInfoChanged(const HealthInfo& health_info) { 


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

health/aidl/default/health-convert.cpp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ void convert(const HealthInfo& info, struct ::android::BatteryProperties* p) { 
    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);