commit e2712eb75a6e8e94fd6e7738b2813061da1ce406
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 17 22:38:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 22:38:53 2020 +0000
tree 8c51539417294386baea96b6f3b3ff62c333975c
parent cef964c1c2466d2ada87d80036fc6e7fc05a624b
parent a33f9f01381ed776acc06fe7cf88d37f8b53d194

Merge "Fix segfault." am: b278ae0c1e am: 5446c9c172 am: b659a47fb2 am: 32253ad14f am: a33f9f0138

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

Change-Id: I62a9dd55b1c90b373fc8e9d7c30cd56537434ca8

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(),