commit a33f9f01381ed776acc06fe7cf88d37f8b53d194
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 17 22:12:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 17 22:12:37 2020 +0000
tree ef54b0dd068e65123a1bc4a2e901097525fccf2a
parent cd81ab5e135370a4517aa057755a80b5c7eec7d5
parent 32253ad14f0d6b9442922d98441f7001a0e49f8e

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

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

Change-Id: Ieba91ea3f0a673c97f4ede18ad4ae2b3057f84fb

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