| commit | 69f5242fbac309a76ebe8356dda1903fe19a7b49 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Sep 26 19:15:18 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 26 19:15:18 2023 +0000 |
| tree | b66c946782bd78dd5854c1c14c1e320bc4a4e8b0 | |
| parent | ddd2d2457ffe9fd9709e2ebf6d0c26867f95747b [diff] | |
| parent | d937584b229de946d52c3278b0f1af67aba87d24 [diff] |
Merge "Don't depend on String8 cast to C string [health]" into main am: d937584b22 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748301 Change-Id: I1c913e1f157c5270904b2d92d729b85977b5189d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/health/1.0/default/convert.cpp b/health/1.0/default/convert.cpp index 31b4679..e12e197 100644 --- a/health/1.0/default/convert.cpp +++ b/health/1.0/default/convert.cpp
@@ -117,7 +117,7 @@ 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,