Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22
am: 69f5242fba
am: bd44ec07a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301 Change-Id: Ieb96a77a258776ac48de153b8cecbf19497ddab6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4d79351da6
1 changed files with 1 additions and 1 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue