ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

charger: Avoid a couple string constructions

Browse source 
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
This commit is contained in:
Greg Kaiser 2020-08-12 07:03:50 -07:00
parent 546cf270ab
commit 8763fd26fb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
healthd/healthd_mode_charger.cpp
View file

@ -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");