From fcaba4b69c04d70dedb9b611044b64ec826e1109 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Fri, 11 Aug 2023 16:04:23 +0000 Subject: [PATCH] Use String8/16 c_str [health] Bug: 295394788 Test: make checkbuild Change-Id: I6671af787ca8c687d30d0db8dbb4f639157b5e81 --- health/1.0/default/convert.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/health/1.0/default/convert.cpp b/health/1.0/default/convert.cpp index 3680d4d000..31b4679980 100644 --- a/health/1.0/default/convert.cpp +++ b/health/1.0/default/convert.cpp @@ -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) {