commit d0fd93097c2fb9caf253a5f9bb6715570cd7ebb9
author Devin Moore <devinmoore@google.com> Mon Jul 20 23:25:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 20 23:25:26 2020 +0000
tree 47eee178519a76670e1772c03e9e2cb6ce3f1871
parent b278ae0c1ebf6d19113f5e46d63c8a3a50c43c4b
parent 815e9dc82d22b041e2fce2c714753ab068ee50b8

Merge changes from topic "nativehandle"

* changes:
  *common: create current API dump
  *common: use package as name
  graphics common: fix AIDL BufferUsage calculation
  Add AIDL type for HardwareBuffer

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