Merge "Use String8/16 c_str [health]" into main am: e76430d6f8 am: abb05b95e3 am: 06ba49fe3e

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

Change-Id: Ib53f3bfccf25a07bb394b20253cd58e2497e604f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tomasz Wasilczyk
2023-08-30 00:04:10 +00:00
committed by Automerger Merge Worker

View File

@@ -26,19 +26,18 @@ void convertToHealthConfig(const struct healthd_config *hc, HealthConfig& config
config.periodicChoresIntervalFast = hc->periodic_chores_interval_fast;
config.periodicChoresIntervalSlow = hc->periodic_chores_interval_slow;
config.batteryStatusPath = hc->batteryStatusPath.string();
config.batteryHealthPath = hc->batteryHealthPath.string();
config.batteryPresentPath = hc->batteryPresentPath.string();
config.batteryCapacityPath = hc->batteryCapacityPath.string();
config.batteryVoltagePath = hc->batteryVoltagePath.string();
config.batteryTemperaturePath = hc->batteryTemperaturePath.string();
config.batteryTechnologyPath = hc->batteryTechnologyPath.string();
config.batteryCurrentNowPath = hc->batteryCurrentNowPath.string();
config.batteryCurrentAvgPath = hc->batteryCurrentAvgPath.string();
config.batteryChargeCounterPath = hc->batteryChargeCounterPath.string();
config.batteryFullChargePath = hc->batteryFullChargePath.string();
config.batteryCycleCountPath = hc->batteryCycleCountPath.string();
config.batteryStatusPath = hc->batteryStatusPath.c_str();
config.batteryHealthPath = hc->batteryHealthPath.c_str();
config.batteryPresentPath = hc->batteryPresentPath.c_str();
config.batteryCapacityPath = hc->batteryCapacityPath.c_str();
config.batteryVoltagePath = hc->batteryVoltagePath.c_str();
config.batteryTemperaturePath = hc->batteryTemperaturePath.c_str();
config.batteryTechnologyPath = hc->batteryTechnologyPath.c_str();
config.batteryCurrentNowPath = hc->batteryCurrentNowPath.c_str();
config.batteryCurrentAvgPath = hc->batteryCurrentAvgPath.c_str();
config.batteryChargeCounterPath = hc->batteryChargeCounterPath.c_str();
config.batteryFullChargePath = hc->batteryFullChargePath.c_str();
config.batteryCycleCountPath = hc->batteryCycleCountPath.c_str();
}
void convertFromHealthConfig(const HealthConfig& c, struct healthd_config *hc) {