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

Commit 2d67b6d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't depend on String8 cast to C string [health]" into main am:... 

Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b am: 69f5242f am: bd44ec07 am: 4d79351d am: e23e5c94

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



Change-Id: Id918272405a3ceb1f10574c401cb1c60dbbe3a2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c643a062 e23e5c94

health/1.0/default/convert.cpp

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void convertToHealthInfo(const struct android::BatteryProperties *p, 
    info.batteryCycleCount      = p->batteryCycleCount;

    info.batteryFullCharge      = p->batteryFullCharge;

    info.batteryChargeCounter   = p->batteryChargeCounter;

    info.batteryTechnology      = p->batteryTechnology;

    info.batteryTechnology      = p->batteryTechnology.c_str();

}



void convertFromHealthInfo(const HealthInfo& info,