From 8763fd26fb2af91126a405b243c90ce026b29aec Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 12 Aug 2020 07:03:50 -0700 Subject: [PATCH] charger: Avoid a couple string constructions With a couple recent changes to APIs taking a const std::string&, instead of a const char *, we switch to directly passing in a reference to our string. Test: TreeHugger Change-Id: Id9f832dd5e3def28cfeaa0d3cda7da323332b16c --- healthd/healthd_mode_charger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/healthd/healthd_mode_charger.cpp b/healthd/healthd_mode_charger.cpp index 04a99a30e..e95efc04c 100644 --- a/healthd/healthd_mode_charger.cpp +++ b/healthd/healthd_mode_charger.cpp @@ -693,7 +693,7 @@ void Charger::Init(struct healthd_config* config) { InitAnimation(); - ret = CreateDisplaySurface(batt_anim_.fail_file.c_str(), &surf_unknown_); + ret = CreateDisplaySurface(batt_anim_.fail_file, &surf_unknown_); if (ret < 0) { LOGE("Cannot load custom battery_fail image. Reverting to built in: %d\n", ret); ret = CreateDisplaySurface((system_animation_root + "charger/battery_fail.png"s).c_str(), @@ -708,7 +708,7 @@ void Charger::Init(struct healthd_config* config) { int scale_count; int scale_fps; // Not in use (charger/battery_scale doesn't have FPS text // chunk). We are using hard-coded frame.disp_time instead. - ret = CreateMultiDisplaySurface(batt_anim_.animation_file.c_str(), &scale_count, &scale_fps, + ret = CreateMultiDisplaySurface(batt_anim_.animation_file, &scale_count, &scale_fps, &scale_frames); if (ret < 0) { LOGE("Cannot load battery_scale image\n");