commit b659a47fb20266fed2b3d11e8b220b59fa3b373f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 17 21:40:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 21:40:10 2020 +0000
tree 97e1157e0e905d851d0d0676e8f9c324c861c860
parent 8c33403a101f144c6d782b05f2feccf831e7972a
parent 5446c9c172b0c4bfccc161e21eb0cf1a2e7b083f

Merge "Fix segfault." am: b278ae0c1e am: 5446c9c172

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

Change-Id: I6502829205ede2de914b27e6c2c5c42916af2b39

health/1.0/default/convert.cpp

diff --git a/health/1.0/default/convert.cpp b/health/1.0/default/convert.cpp
index 7f1e3c4..3680d4d 100644
--- a/health/1.0/default/convert.cpp
+++ b/health/1.0/default/convert.cpp
@@ -79,7 +79,7 @@
 
     hc->batteryCurrentAvgPath =
         android::String8(c.batteryCurrentAvgPath.c_str(),
-                         c.batteryCurrentNowPath.size());
+                         c.batteryCurrentAvgPath.size());
 
     hc->batteryChargeCounterPath =
         android::String8(c.batteryChargeCounterPath.c_str(),